Remove beforeEach and afterEach test methods

src/main/java/com/teragrep/cfe_16/config/Configuration.java

@@ -83,6 +83,26 @@ public Configuration() {
 
     }
 
+    public Configuration(
+            final String syslogHost,
+            final int syslogPort,
+            final int maxAckValue,
+            final int maxAckAge,
+            final int maxSessionAge,
+            final int maxChannels,
+            final long pollTime,
+            final boolean printTimes
+    ) {
+        this.syslogHost = syslogHost;
+        this.syslogPort = syslogPort;
+        this.maxAckValue = maxAckValue;
+        this.maxAckAge = maxAckAge;
+        this.maxSessionAge = maxSessionAge;
+        this.maxChannels = maxChannels;
+        this.pollTime = pollTime;
+        this.printTimes = printTimes;
+    }
+
     @Bean
     public String syslogHost() {
         return this.syslogHost;

src/main/java/com/teragrep/cfe_16/connection/RelpConnection.java

@@ -84,7 +84,7 @@ synchronized private void autoConnect() {
         this.connect();
     }
 
-    synchronized private void connect() {
+    synchronized public void connect() {
         boolean notConnected = true;
         while (notConnected) {
             boolean connected = false;

src/main/java/com/teragrep/cfe_16/rest/HECRestController.java

@@ -73,11 +73,15 @@ public class HECRestController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HECRestController.class);
     private final ObjectMapper objectMapper = new ObjectMapper();
-    @Autowired
-    private HECService service;
+
+    private final HECService service;
+    private final Configuration configuration;
 
     @Autowired
-    private Configuration configuration;
+    public HECRestController(final HECService service, final Configuration configuration) {
+        this.service = service;
+        this.configuration = configuration;
+    }
 
     @RequestMapping(
             value = "services/collector",

src/test/java/com/teragrep/cfe_16/EventDataToSyslogMessageTest.java

@@ -69,7 +69,7 @@
 /**
  * Tests the functionality of the eventData.toSyslogMessage method
  */
-public class EventDataToSyslogMessageTest {
+class EventDataToSyslogMessageTest {
 
     @Test
     @DisplayName("test fields when time is provided in HECRecord")

src/test/java/com/teragrep/cfe_16/HECBatchTest.java

@@ -61,13 +61,13 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 
-class HECBatchTest {
-
-    private static final String channel1 = "CHANNEL_11111";
-    private static final String authToken1 = "AUTH_TOKEN_12223";
+final class HECBatchTest {
 
     @Test
-    public void toHECRecordListTest() {
+    void toHECRecordListTest() {
+        final String channel1 = "CHANNEL_11111";
+        final String authToken1 = "AUTH_TOKEN_12223";
+
         final String allEventsInJson = "{\"sourcetype\": \"mysourcetype\", \"event\": \"Hello, world!\", \"host\": \"localhost\", \"source\": \"mysource\", \"index\": \"myindex\", \"time\": 123456}";
         final HECRecord supposedResponse = new HECRecordImpl(
                 channel1,
@@ -105,7 +105,10 @@ public void toHECRecordListTest() {
      * Tests for JsonSyntaxException
      */
     @Test
-    public void toHECRecordListUsesAStubIfParsingFailsWithMalformedJSONTest() {
+    void toHECRecordListUsesAStubIfParsingFailsWithMalformedJSONTest() {
+        final String channel1 = "CHANNEL_11111";
+        final String authToken1 = "AUTH_TOKEN_12223";
+
         final String allEventsInJson = "{\"sourcetype\": \"mysourcetype\", \"event\": {{{{}}}}";
         final HECBatch HECBatch = new HECBatch(
                 authToken1,
@@ -121,7 +124,10 @@ public void toHECRecordListUsesAStubIfParsingFailsWithMalformedJSONTest() {
      * Tests for EventStub existence, since the Event should not be valid
      */
     @Test
-    public void toHECRecordListUsesAStubIfParsingFailsWithEmptyJSONTest() {
+    void toHECRecordListUsesAStubIfParsingFailsWithEmptyJSONTest() {
+        final String channel1 = "CHANNEL_11111";
+        final String authToken1 = "AUTH_TOKEN_12223";
+
         final String allEventsInJson = "{\"sourcetype\": \"mysourcetype\", \"event\": null}";
         final String supposedResponse = "Event field was not textual";
         final HECBatch HECBatch = new HECBatch(
@@ -139,7 +145,10 @@ public void toHECRecordListUsesAStubIfParsingFailsWithEmptyJSONTest() {
     }
 
     @Test
-    public void noEventFieldInRequestTest() {
+    void noEventFieldInRequestTest() {
+        final String channel1 = "CHANNEL_11111";
+        final String authToken1 = "AUTH_TOKEN_12223";
+
         final String allEventsInJson = "{\"sourcetype\": \"mysourcetype\", \"host\": \"localhost\", \"source\": \"mysource\", \"index\": \"myindex\"}";
         final HECBatch HECBatch = new HECBatch(
                 authToken1,
@@ -152,7 +161,10 @@ public void noEventFieldInRequestTest() {
     }
 
     @Test
-    public void eventFieldBlankInRequestTest() {
+    void eventFieldBlankInRequestTest() {
+        final String channel1 = "CHANNEL_11111";
+        final String authToken1 = "AUTH_TOKEN_12223";
+
         final String allEventsInJson = "{\"sourcetype\": \"mysourcetype\", \"event\": \"\", \"host\": \"localhost\", \"source\": \"mysource\", \"index\": \"myindex\"}";
         final HECBatch HECBatch = new HECBatch(
                 authToken1,

src/test/java/com/teragrep/cfe_16/SessionManagerTests.java

@@ -48,30 +48,20 @@
 import com.teragrep.cfe_16.bo.Session;
 import com.teragrep.cfe_16.config.Configuration;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /*
  * Tests the functionality of SessionManager
  */
-public class SessionManagerTests {
-
-    private SessionManager sessionManager;
-
-    /*
-     * A SessionManager is initialized
-     */
-    @BeforeEach
-    public void initialize() {
-        sessionManager = new SessionManager(new Configuration());
-    }
+final class SessionManagerTests {
 
     /*
      * Tests creating a session with SessionManager and getting that same session
      * from SessionManager
      */
     @Test
-    public void createSessionAndGetItWithAuthTokenTest() {
+    void createSessionAndGetItWithAuthTokenTest() {
+        final SessionManager sessionManager = new SessionManager(new Configuration());
 
         String authToken1 = "AUTH_TOKEN_12345";
         String authToken2 = "AUTH_TOKEN_54321";
@@ -92,7 +82,9 @@ public void createSessionAndGetItWithAuthTokenTest() {
     }
 
     @Test
-    public void sessionCreationAndDeletionTests() {
+    void sessionCreationAndDeletionTests() {
+        final SessionManager sessionManager = new SessionManager(new Configuration());
+
         Session session = sessionManager.createSession("AUTH");
         Assertions.assertTrue(session.addChannel(Session.DEFAULT_CHANNEL));
         Assertions.assertFalse(session.addChannel(Session.DEFAULT_CHANNEL));

src/test/java/com/teragrep/cfe_16/TokenManagerTests.java

@@ -53,16 +53,15 @@
 /*
  * Tests the functionality of TokenManager
  */
-public class TokenManagerTests {
-
-    TokenManager manager = new TokenManager();
+final class TokenManagerTests {
 
     /*
      * Tests TokenManager's tokenIsMissing() method which checks if
      * HttpServletRequest's header has an authentication token in it.
      */
     @Test
-    public void tokenCheckingTest() {
+    void tokenCheckingTest() {
+        final TokenManager manager = new TokenManager();
 
         MockHttpServletRequest requestWithHttpHeaderAuth = new MockHttpServletRequest();
         MockHttpServletRequest requestWithBasicAuth = new MockHttpServletRequest();
@@ -84,7 +83,9 @@ public void tokenCheckingTest() {
      * format.
      */
     @Test
-    public void basicAuthCheckingTest() {
+    void basicAuthCheckingTest() {
+        final TokenManager manager = new TokenManager();
+
         String authToken = "AUTH_TOKEN_11111";
         String basicAuthHeader = "Basic x:" + authToken;
 
@@ -99,7 +100,9 @@ public void basicAuthCheckingTest() {
      * authentication token when it is given in basic authentication format.
      */
     @Test
-    public void getTokenFromBasicAuthTest() {
+    void getTokenFromBasicAuthTest() {
+        final TokenManager manager = new TokenManager();
+
         String authToken = "AUTH_TOKEN_11111";
         String basicAuthCredentials = "x:" + authToken;
         String credentialsEncoded = Base64.getEncoder().encodeToString(basicAuthCredentials.getBytes());