This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/ease-use-of-filterproviderimpl in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b310af8577fb68bb95d49ee12b39bfe1bc067bdc Author: Konrad Windszus <[email protected]> AuthorDate: Tue Jul 11 15:05:29 2023 +0200 Restore nullness annotations Remove non-related code cleanup --- .../authorization/principalbased/impl/FilterProviderImpl.java | 8 ++++---- .../principalbased/impl/FilterProviderImplTest.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java b/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java index eb903887de..6eb212c7b6 100644 --- a/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java +++ b/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImpl.java @@ -81,7 +81,7 @@ public class FilterProviderImpl implements FilterProvider { * @param oakPath the repository path where the principals are located * @since 1.54 */ - public FilterProviderImpl(String oakPath) { + public FilterProviderImpl(@NotNull String oakPath) { setPath(oakPath); } @@ -112,16 +112,16 @@ public class FilterProviderImpl implements FilterProvider { } @Activate - protected void activate(Configuration configuration) { + protected void activate(Configuration configuration, Map<String, Object> properties) { setPath(configuration.path()); } @Modified - protected void modified(Configuration configuration) { + protected void modified(Configuration configuration, Map<String, Object> properties) { setPath(configuration.path()); } - private void setPath(String path) { + private void setPath(@NotNull String path) { checkState(isValidPath(path), "Configured path must be a valid absolute path."); oakPath = path; } diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImplTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImplTest.java index 87a6d39b6a..6a1200dd13 100644 --- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImplTest.java +++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/FilterProviderImplTest.java @@ -76,32 +76,32 @@ public class FilterProviderImplTest { FilterProviderImpl fp = new FilterProviderImpl(); assertNull(fp.getFilterRoot()); - fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn(PATH).getMock()); + fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn(PATH).getMock(), Collections.emptyMap()); assertEquals(PATH, fp.getFilterRoot()); } @Test(expected = IllegalStateException.class) public void testActivateEmptyPath() { FilterProviderImpl fp = new FilterProviderImpl(); - fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn("").getMock()); + fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn("").getMock(), Collections.emptyMap()); } @Test(expected = IllegalStateException.class) public void testActivateNullPath() { FilterProviderImpl fp = new FilterProviderImpl(); - fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn(null).getMock()); + fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn(null).getMock(), Collections.emptyMap()); } @Test(expected = IllegalStateException.class) public void testActivateRelativePath() { FilterProviderImpl fp = new FilterProviderImpl(); - fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn("rel/path").getMock()); + fp.activate(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn("rel/path").getMock(), Collections.emptyMap()); } @Test public void testModified() { String modifiedPath = "/modified/path"; - provider.modified(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn(modifiedPath).getMock()); + provider.modified(when(mock(FilterProviderImpl.Configuration.class).path()).thenReturn(modifiedPath).getMock(), Collections.emptyMap()); assertEquals(modifiedPath, provider.getFilterRoot()); }
