Remove redundant public modifiers

Tobianas · ihrasko · commit f8922be85ed3 · 2026-05-21T15:08:07.000+02:00
These tests do not need to be public for JUnit 5.

JIRA: LIGHTY-409
Signed-off-by: tobias.pobocik &lt;tobias.pobocik@pantheon.tech&gt;
diff --git a/lighty-core/lighty-codecs-util/src/test/java/io/lighty/codecs/util/AbstractCodecTest.java b/lighty-core/lighty-codecs-util/src/test/java/io/lighty/codecs/util/AbstractCodecTest.java
@@ -48,7 +48,7 @@
 import org.opendaylight.yangtools.yang.xpath.impl.AntlrXPathParserFactory;
 import org.xml.sax.SAXException;
 
-public abstract class AbstractCodecTest {
+abstract class AbstractCodecTest {
     protected static final QName MAKE_TOAST_RPC_QNAME = qOfToasterModel("make-toast");
     protected static final QName CONTAINER_RPC_QNAME = qOfTestModel("container-io-rpc");
     protected static final QName LEAF_RPC_QNAME = qOfTestModel("simple-input-output-rpc");
@@ -68,7 +68,7 @@ public abstract class AbstractCodecTest {
     protected final BindingCodecContext bindingCodecContext;
     protected final EffectiveModelContext effectiveModelContext;
 
-    public AbstractCodecTest() throws YangParserException {
+    AbstractCodecTest() throws YangParserException {
         this.bindingCodecContext = createCodecContext(loadModuleInfos());
         this.effectiveModelContext = bindingCodecContext.getRuntimeContext().modelContext();
 
diff --git a/lighty-core/lighty-common/src/test/java/io/lighty/core/common/SocketAnalyzerTest.java b/lighty-core/lighty-common/src/test/java/io/lighty/core/common/SocketAnalyzerTest.java
@@ -13,12 +13,12 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class SocketAnalyzerTest {
+class SocketAnalyzerTest {
 
     private static final long TIMEOUT = 3;
 
     @Test
-    public void socketAnalyzerAwaitPortSuccess() throws IOException, InterruptedException {
+    void socketAnalyzerAwaitPortSuccess() throws IOException, InterruptedException {
         final int availablePort = findAvailablePort();
         try (ServerSocket ignored = new ServerSocket(availablePort)) {
             Assertions.assertFalse(SocketAnalyzer.awaitPortAvailable(availablePort, TIMEOUT, TimeUnit.SECONDS));
diff --git a/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/api/LightyModuleTest.java b/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/api/LightyModuleTest.java
@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-public class LightyModuleTest {
+class LightyModuleTest {
     private static final long MAX_INIT_TIMEOUT = 15000L;
     private static final long MAX_SHUTDOWN_TIMEOUT = 15000L;
 
@@ -39,17 +39,17 @@ private ExecutorService getExecutorService() {
     }
 
     @BeforeEach
-    public void initExecutor() {
+    void initExecutor() {
         this.executorService = Mockito.spy(new ScheduledThreadPoolExecutor(1));
     }
 
     @AfterEach
-    public void shutdownExecutor() {
+    void shutdownExecutor() {
         this.executorService.shutdownNow();
     }
 
     @Test
-    public void testStartShutdown() throws Exception {
+    void testStartShutdown() throws Exception {
         this.moduleUnderTest = getModuleUnderTest(getExecutorService());
         this.moduleUnderTest.start().get(MAX_INIT_TIMEOUT, TimeUnit.MILLISECONDS);
         Mockito.verify(executorService, Mockito.times(1)).execute(Mockito.any());
@@ -58,7 +58,7 @@ public void testStartShutdown() throws Exception {
     }
 
     @Test
-    public void testStartStop_whenAlreadyStartedStopped() throws Exception {
+    void testStartStop_whenAlreadyStartedStopped() throws Exception {
         this.moduleUnderTest = getModuleUnderTest(getExecutorService());
         try {
             this.moduleUnderTest.start().get(MAX_INIT_TIMEOUT, TimeUnit.MILLISECONDS);
@@ -74,7 +74,7 @@ public void testStartStop_whenAlreadyStartedStopped() throws Exception {
     }
 
     @Test
-    public void testShutdown_before_start() throws Exception {
+    void testShutdown_before_start() throws Exception {
         this.moduleUnderTest = getModuleUnderTest(getExecutorService());
         this.moduleUnderTest.shutdown(MAX_SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
         Mockito.verify(executorService, Mockito.times(0)).execute(Mockito.any());
diff --git a/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/api/SystemReadyMonitorTest.java b/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/api/SystemReadyMonitorTest.java
@@ -17,10 +17,10 @@
 import org.opendaylight.infrautils.ready.SystemReadyListener;
 import org.opendaylight.infrautils.ready.SystemState;
 
-public class SystemReadyMonitorTest {
+class SystemReadyMonitorTest {
 
     @Test
-    public void testSystemBootFailed() throws Exception {
+    void testSystemBootFailed() throws Exception {
         SystemReadyListener listener1 = Mockito.mock(SystemReadyListener.class);
         SystemReadyListener listener2 = Mockito.mock(SystemReadyListener.class);
         LightySystemReadyMonitorImpl systemReadyMonitor = new LightySystemReadyMonitorImpl();
@@ -41,7 +41,7 @@ public void testSystemBootFailed() throws Exception {
     }
 
     @Test
-    public void testSystemBootOK() throws Exception {
+    void testSystemBootOK() throws Exception {
         SystemReadyListener listener1 = Mockito.mock(SystemReadyListener.class);
         SystemReadyListener listener2 = Mockito.mock(SystemReadyListener.class);
         LightySystemReadyMonitorImpl systemReadyMonitor = new LightySystemReadyMonitorImpl();
diff --git a/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/impl/tests/LightyControllerTestBase.java b/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/impl/tests/LightyControllerTestBase.java
@@ -21,15 +21,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class LightyControllerTestBase {
+abstract class LightyControllerTestBase {
 
     private static final Logger LOG = LoggerFactory.getLogger(LightyControllerTestBase.class);
     public static final long SHUTDOWN_TIMEOUT_MILLIS = 60_000;
 
     private static LightyController lightyController;
 
     @BeforeAll
-    public static void startLighty() throws Exception {
+    static void startLighty() throws Exception {
         LOG.info("startLighty from TestBase called");
         LightyControllerBuilder lightyControllerBuilder = new LightyControllerBuilder();
         lightyController = lightyControllerBuilder.from(ControllerConfigUtils.getDefaultSingleNodeConfiguration())
@@ -41,7 +41,7 @@ public static void startLighty() throws Exception {
     }
 
     @BeforeEach
-    public void handleTestMethodName(final TestInfo testInfo) {
+    void handleTestMethodName(final TestInfo testInfo) {
         String testName = testInfo.getTestMethod()
             .map(Method::getName)
             .orElse("unknown");
@@ -50,7 +50,7 @@ public void handleTestMethodName(final TestInfo testInfo) {
     }
 
     @AfterEach
-    public void afterTest(final TestInfo testInfo) {
+    void afterTest(final TestInfo testInfo) {
         String testName = testInfo.getTestMethod()
             .map(Method::getName)
             .orElse("unknown");
@@ -59,7 +59,7 @@ public void afterTest(final TestInfo testInfo) {
     }
 
     @AfterAll
-    public static void shutdownLighty() {
+    static void shutdownLighty() {
         if (lightyController != null) {
             LOG.info("Shutting down Lighty controller");
             lightyController.shutdown(SHUTDOWN_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
diff --git a/lighty-examples/lighty-community-aaa-restconf-app/src/test/java/io/lighty/kit/examples/community/CommunityAAARestconfAppTest.java b/lighty-examples/lighty-community-aaa-restconf-app/src/test/java/io/lighty/kit/examples/community/CommunityAAARestconfAppTest.java
@@ -37,15 +37,15 @@ class CommunityAAARestconfAppTest {
     private static Main main;
 
     @BeforeAll
-    public static void startUp() {
+    static void startUp() {
         final URL config = CommunityAAARestconfAppTest.class.getResource(TEST_CONFIG_JSON);
         main = new Main();
         main.start(new String[]{config.getPath()}, false);
         httpClient = HttpClient.newHttpClient();
     }
 
     @AfterAll
-    public static void tearDown() {
+    static void tearDown() {
         httpClient = null;
         main.shutdown();
     }
diff --git a/lighty-examples/lighty-community-netty-restconf-app/src/test/java/io/lighty/controllers/nettyrestconfapp/tests/RestconfAppTest.java b/lighty-examples/lighty-community-netty-restconf-app/src/test/java/io/lighty/controllers/nettyrestconfapp/tests/RestconfAppTest.java
@@ -41,7 +41,7 @@ class RestconfAppTest {
     private static RestClient restClient;
 
     @BeforeAll
-    public static void init() {
+    static void init() {
         restconfApp = new Main();
         restconfApp.start(new String[]{CONFIG.getPath()}, false);
         restClient = new RestClient("http://localhost:8888/");
@@ -87,7 +87,7 @@ void simpleAuthorizationTest() throws IOException, InterruptedException {
 
     @SuppressWarnings("checkstyle:illegalCatch")
     @AfterAll
-    public static void shutdown() {
+    static void shutdown() {
         restconfApp.shutdown();
         try {
             restClient.close();
diff --git a/lighty-examples/lighty-community-restconf-actions-app/src/test/java/io/lighty/examples/controller/actions/RestconfActionsAppTest.java b/lighty-examples/lighty-community-restconf-actions-app/src/test/java/io/lighty/examples/controller/actions/RestconfActionsAppTest.java
@@ -42,7 +42,7 @@ class RestconfActionsAppTest {
     private static RestClient restClient;
 
     @BeforeAll
-    public static void init() {
+    static void init() {
         restconfApp = new Main();
         restconfApp.start();
         restClient = new RestClient("http://localhost:8888/");
@@ -105,7 +105,7 @@ void bindingActionInvocationTest() throws Exception {
 
     @SuppressWarnings("checkstyle:illegalCatch")
     @AfterAll
-    public static void shutdown() {
+    static void shutdown() {
         restconfApp.shutdown();
         try {
             restClient.close();
diff --git a/lighty-examples/lighty-community-restconf-netconf-app/src/test/java/io/lighty/examples/controllers/restconfapp/tests/RestconfAppTest.java b/lighty-examples/lighty-community-restconf-netconf-app/src/test/java/io/lighty/examples/controllers/restconfapp/tests/RestconfAppTest.java
@@ -34,7 +34,7 @@ class RestconfAppTest {
     private static RestClient restClient;
 
     @BeforeAll
-    public static void init() {
+    static void init() {
         restconfApp = new Main();
         restconfApp.start();
         restClient = new RestClient("http://localhost:8888/");
@@ -78,7 +78,7 @@ void openApiURLsTest() throws IOException, InterruptedException {
 
     @SuppressWarnings("checkstyle:illegalCatch")
     @AfterAll
-    public static void shutdown() {
+    static void shutdown() {
         restconfApp.shutdown();
         try {
             restClient.close();
diff --git a/lighty-examples/lighty-controller-springboot-netconf/src/test/java/io/lighty/core/controller/springboot/test/SpringBootAppTest.java b/lighty-examples/lighty-controller-springboot-netconf/src/test/java/io/lighty/core/controller/springboot/test/SpringBootAppTest.java
@@ -40,7 +40,7 @@ class SpringBootAppTest {
     private static RestClient restClient;
 
     @BeforeAll
-    public static void init() {
+    static void init() {
         appContext = SpringApplication.run(MainApp.class, new String[]{});
         restClient = new RestClient("http://localhost:8888/");
     }
@@ -97,7 +97,7 @@ void simpleApplicationTest() throws Exception {
 
     @SuppressWarnings("checkstyle:illegalCatch")
     @AfterAll
-    public static void shutdown() {
+    static void shutdown() {
         if (appContext != null) {
             appContext.stop();
         }
diff --git a/lighty-examples/lighty-guice-app/src/test/java/io/lighty/examples/controllers/guice/LightyGuiceAppTest.java b/lighty-examples/lighty-guice-app/src/test/java/io/lighty/examples/controllers/guice/LightyGuiceAppTest.java
@@ -35,7 +35,7 @@ class LightyGuiceAppTest {
     private static DataStoreService service;
 
     @BeforeAll
-    public static void startUp() {
+    static void startUp() {
         final var capturedService = ArgumentCaptor.forClass(DataStoreServiceImpl.class);
         main = Mockito.spy(new Main());
         main.start(new String[]{}, false);
@@ -44,7 +44,7 @@ public static void startUp() {
     }
 
     @AfterAll
-    public static void tearDown() {
+    static void tearDown() {
         main.shutdown();
     }
 
diff --git a/lighty-modules/integration-tests-aaa/src/test/java/io/lighty/kit/examples/community/tests/AAATestIT.java b/lighty-modules/integration-tests-aaa/src/test/java/io/lighty/kit/examples/community/tests/AAATestIT.java
@@ -39,7 +39,7 @@
 import org.slf4j.LoggerFactory;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class AAATestIT {
+class AAATestIT {
 
     private static final Logger LOG = LoggerFactory.getLogger(AAATestIT.class);
     public static final long SHUTDOWN_TIMEOUT_MILLIS = 60_000;
@@ -78,7 +78,7 @@ public class AAATestIT {
     private Main main;
 
     @BeforeAll
-    public void initClass() throws Exception {
+    void initClass() throws Exception {
         LOG.info("init restconf and controller");
         this.main = new Main();
         this.main.start(new String[]{}, false);
@@ -96,7 +96,7 @@ public void initClass() throws Exception {
     }
 
     @BeforeEach
-    public void init() throws Exception {
+    void init() throws Exception {
         LOG.info("start all http clients");
         httpClient = new HttpClient();
         httpClient.setIdleTimeout(60000 * 60);
@@ -113,7 +113,7 @@ public void init() throws Exception {
     }
 
     @Test
-    public void getAndCheckDefaultAdminUsersTest() throws Exception {
+    void getAndCheckDefaultAdminUsersTest() throws Exception {
         LOG.info("Get all user tests");
 
         assertUsersExist(adminConnectionCorrect, UserDetails.of(ADMIN, ADMIN_DESCRIPTION, ADMIN_SDN));
@@ -127,7 +127,7 @@ public void getAndCheckDefaultAdminUsersTest() throws Exception {
     }
 
     @Test
-    public void addUserTest() throws Exception {
+    void addUserTest() throws Exception {
         LOG.info("Add new user test");
 
         final ContentResponse getAllUsersExpectOne = getAllUsers(adminConnectionCorrect);
@@ -160,7 +160,7 @@ public void addUserTest() throws Exception {
     }
 
     @Test
-    public void getSpecificUsersTest() throws Exception {
+    void getSpecificUsersTest() throws Exception {
         LOG.info("get specific user test");
         assertEquals(HttpStatus.CREATED_201, addUser(adminConnectionCorrect, NEW_USER_DATA).getStatus());
 
@@ -178,7 +178,7 @@ public void getSpecificUsersTest() throws Exception {
     }
 
     @Test
-    public void updateUserInfoTest() throws Exception {
+    void updateUserInfoTest() throws Exception {
         LOG.info("Update user data and try to use them");
         assertEquals(HttpStatus.CREATED_201, addUser(adminConnectionCorrect, NEW_USER_DATA).getStatus());
         assertEquals(HttpStatus.OK_200, updateUser(adminConnectionCorrect, NEW_USER_SDN, UPDATE_USER_DATA).getStatus());
@@ -201,7 +201,7 @@ public void updateUserInfoTest() throws Exception {
     }
 
     @Test
-    public void deleteUserTest() throws Exception {
+    void deleteUserTest() throws Exception {
         LOG.info("delete user");
         assertEquals(HttpStatus.CREATED_201, addUser(adminConnectionCorrect, NEW_USER_DATA).getStatus());
 
@@ -210,25 +210,25 @@ public void deleteUserTest() throws Exception {
     }
 
     @Test
-    public void readNotExistingUserExpectError() throws Exception {
+    void readNotExistingUserExpectError() throws Exception {
         LOG.info("get specific not existing user");
         assertEquals(HttpStatus.NOT_FOUND_404, getSpecificUser(adminConnectionCorrect, NEW_USER).getStatus());
     }
 
     @Test
-    public void deleteNotExistingUserExpectError() throws Exception {
+    void deleteNotExistingUserExpectError() throws Exception {
         LOG.info("delete specific not existing user");
         assertEquals(HttpStatus.NOT_FOUND_404, deleteUser(adminConnectionCorrect, NEW_USER_SDN).getStatus());
     }
 
     @Test
-    public void readDataCorrectCredentials() throws Exception {
+    void readDataCorrectCredentials() throws Exception {
         LOG.info("try to get modules state with correct credentials");
         assertEquals(HttpStatus.OK_200, getSomeData(adminConnectionCorrect).getStatus());
     }
 
     @Test
-    public void readDataWrongCredentials() throws Exception {
+    void readDataWrongCredentials() throws Exception {
         LOG.info("try to get modules state with incorrect credentials");
         final Connection adminConnectionWrong = new Connection(httpClient, this.wrongAuth);
         assertEquals(HttpStatus.UNAUTHORIZED_401, getSomeData(adminConnectionWrong).getStatus());
@@ -368,7 +368,7 @@ public void cleanUp() throws Exception {
     }
 
     @AfterAll
-    public void shutdown() {
+    void shutdown() {
         LOG.info("removing db files");
         File currentDirFile = new File(".");
         String lightyTestsPath = currentDirFile.getAbsolutePath();
diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java
@@ -30,7 +30,7 @@ class YangInstanceNormToGnmiUpdateCodecTest {
     private static YangInstanceNormToGnmiUpdateCodec codec;
 
     @BeforeAll
-    public static void init() throws IOException, YangLoadException, SchemaException, ConfigurationException {
+    static void init() throws IOException, YangLoadException, SchemaException, ConfigurationException {
         testCases = new YangInstanceNormToGnmiUpdateTestCases();
         codec = new YangInstanceNormToGnmiUpdateCodec(
                 testCases.getSchemaContextProvider(),
diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/testcases/CodecTestCasesBase.java b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/testcases/CodecTestCasesBase.java
@@ -33,7 +33,7 @@
 /**
  * Contains various YangInstanceIdentifier and NormalizeNode pairs uses for testing codecs.
  */
-public class CodecTestCasesBase {
+class CodecTestCasesBase {
     private static final String BASE_YANGS_PATH = "src/test/resources/additional/test/schema";
     private static final String OC_GNMI_CONFIG = "/lightyconfigs/openconfig_gnmi_config.json";
     private static final String OC_IF_TYPES_ID = "openconfig-if-types";
@@ -45,7 +45,7 @@ public class CodecTestCasesBase {
 
     private final SchemaContextProvider schemaContextProvider;
 
-    public CodecTestCasesBase() throws YangLoadException, SchemaException, ConfigurationException {
+    CodecTestCasesBase() throws YangLoadException, SchemaException, ConfigurationException {
         final GnmiConfiguration gnmiConfiguration = GnmiConfigUtils.getGnmiConfiguration(
                 this.getClass().getResourceAsStream(OC_GNMI_CONFIG));
         Assertions.assertNotNull(gnmiConfiguration.getYangModulesInfo());
diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiCertificatesTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiCertificatesTest.java
diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiITBase.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiITBase.java
diff --git a/lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/NetconfBaseServiceBaseTest.java b/lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/NetconfBaseServiceBaseTest.java
diff --git a/lighty-modules/lighty-openapi/src/test/java/io/lighty/openapi/OpenApiLightyTest.java b/lighty-modules/lighty-openapi/src/test/java/io/lighty/openapi/OpenApiLightyTest.java
diff --git a/lighty-modules/lighty-openapi/src/test/java/io/lighty/openapi/OpenApiLightyTestBase.java b/lighty-modules/lighty-openapi/src/test/java/io/lighty/openapi/OpenApiLightyTestBase.java
diff --git a/lighty-modules/lighty-restconf-nb-community/src/test/java/io/lighty/modules/northbound/restconf/community/impl/tests/CommunityRestConfTestBase.java b/lighty-modules/lighty-restconf-nb-community/src/test/java/io/lighty/modules/northbound/restconf/community/impl/tests/CommunityRestConfTestBase.java
diff --git a/lighty-modules/lighty-restconf-netty-nb-community/src/test/java/io/lighty/modules/northbound/netty/restconf/community/impl/tests/NettyRestConfTestBase.java b/lighty-modules/lighty-restconf-netty-nb-community/src/test/java/io/lighty/modules/northbound/netty/restconf/community/impl/tests/NettyRestConfTestBase.java
