From 3f1c7b6b61af9606ae0323654d25f69c080a4b1d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 30 Aug 2023 18:31:50 +0200 Subject: [PATCH] Make nested classes final This fixes checkstyle violations reported by upgraded checkstyle. Change-Id: Icda2fed21a05615c6831a90471202b5dbdee2272 Signed-off-by: Robert Varga --- ...tomFilterAdapterConfigurationImplTest.java | 7 +++---- .../idm/persistence/PasswordHashTest.java | 20 ++++++++++--------- .../auth/PasswordCredentialBuilder.java | 2 +- .../auth/AuthenticationManagerTest.java | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/aaa-filterchain/src/test/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImplTest.java b/aaa-filterchain/src/test/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImplTest.java index 2b21e63a6..fa5dd8ada 100644 --- a/aaa-filterchain/src/test/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImplTest.java +++ b/aaa-filterchain/src/test/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImplTest.java @@ -29,8 +29,7 @@ import org.opendaylight.aaa.filterchain.filters.ExtractFilterConfigFilter; * Custom Filter Adapter Configuration Test Suite. */ public class CustomFilterAdapterConfigurationImplTest { - - private static class TestCustomFilterAdapterListener implements CustomFilterAdapterListener { + private static final class TestCustomFilterAdapterListener implements CustomFilterAdapterListener { volatile List updatedInjectedFilters; @Override @@ -130,7 +129,7 @@ public class CustomFilterAdapterConfigurationImplTest { // just ensures a non-null ServletConfig is accepted. config.registerCustomFilterAdapterConfigurationListener(new CustomFilterAdapterListener() { @Override - public void updateInjectedFilters(List injectedFilters) { + public void updateInjectedFilters(final List injectedFilters) { } @Override @@ -148,7 +147,7 @@ public class CustomFilterAdapterConfigurationImplTest { } @Override - public String getInitParameter(String string) { + public String getInitParameter(final String string) { return null; } diff --git a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/persistence/PasswordHashTest.java b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/persistence/PasswordHashTest.java index 938b74b89..9c9ff96e9 100644 --- a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/persistence/PasswordHashTest.java +++ b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/persistence/PasswordHashTest.java @@ -7,12 +7,14 @@ */ package org.opendaylight.aaa.shiro.idm.persistence; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; import org.opendaylight.aaa.api.IDMStoreException; import org.opendaylight.aaa.api.IIDMStore; import org.opendaylight.aaa.api.PasswordCredentials; @@ -30,18 +32,18 @@ import org.opendaylight.aaa.shiro.idm.IdmLightProxy; * @Author - Sharon Aicler (saichler@cisco.com) */ public class PasswordHashTest { + private final PasswordHashService passwordService = new DefaultPasswordHashService(); private IIDMStore store; - private PasswordHashService passwordService = new DefaultPasswordHashService(); @Before public void before() throws IDMStoreException { - store = Mockito.mock(IIDMStore.class); + store = mock(IIDMStore.class); Domain domain = new Domain(); domain.setName("sdn"); domain.setDomainid("sdn"); - Mockito.when(store.readDomain("sdn")).thenReturn(domain); + doReturn(domain).when(store).readDomain("sdn"); Creds creds = new Creds(); User user = new User(); @@ -66,18 +68,18 @@ public class PasswordHashTest { Role role = new Role(); role.setRoleid("admin"); role.setName("admin"); - Mockito.when(store.readRole("admin")).thenReturn(role); - Mockito.when(store.getUsers(creds.username(), creds.domain())).thenReturn(users); - Mockito.when(store.getGrants(creds.domain(), creds.username())).thenReturn(grants); + doReturn(role).when(store).readRole("admin"); + doReturn(users).when(store).getUsers(creds.username(), creds.domain()); + doReturn(grants).when(store).getGrants(creds.domain(), creds.username()); } @Test public void testPasswordHash() { - IdmLightProxy proxy = new IdmLightProxy(store, passwordService); + final var proxy = new IdmLightProxy(store, passwordService); proxy.authenticate(new Creds()); } - private static class Creds implements PasswordCredentials { + private static final class Creds implements PasswordCredentials { @Override public String username() { return "admin"; diff --git a/aaa-tokenauthrealm/src/main/java/org/opendaylight/aaa/tokenauthrealm/auth/PasswordCredentialBuilder.java b/aaa-tokenauthrealm/src/main/java/org/opendaylight/aaa/tokenauthrealm/auth/PasswordCredentialBuilder.java index 340a627db..fa2e2c608 100644 --- a/aaa-tokenauthrealm/src/main/java/org/opendaylight/aaa/tokenauthrealm/auth/PasswordCredentialBuilder.java +++ b/aaa-tokenauthrealm/src/main/java/org/opendaylight/aaa/tokenauthrealm/auth/PasswordCredentialBuilder.java @@ -37,7 +37,7 @@ public class PasswordCredentialBuilder { return pc; } - private static class MutablePasswordCredentials implements PasswordCredentials { + private static final class MutablePasswordCredentials implements PasswordCredentials { private int hashCode = 0; private String username; private String password; diff --git a/aaa-tokenauthrealm/src/test/java/org/opendaylight/aaa/tokenauthrealm/auth/AuthenticationManagerTest.java b/aaa-tokenauthrealm/src/test/java/org/opendaylight/aaa/tokenauthrealm/auth/AuthenticationManagerTest.java index 0496dbac9..a2cdb51bf 100644 --- a/aaa-tokenauthrealm/src/test/java/org/opendaylight/aaa/tokenauthrealm/auth/AuthenticationManagerTest.java +++ b/aaa-tokenauthrealm/src/test/java/org/opendaylight/aaa/tokenauthrealm/auth/AuthenticationManagerTest.java @@ -95,7 +95,7 @@ public class AuthenticationManagerTest { assertFalse(authManager.isAuthEnabled()); } - private class Worker implements Callable { + private final class Worker implements Callable { @Override public Authentication call() throws Exception { return authManager.get(); -- 2.36.6