Resolve checkstyle warnings in PNF simulator

Issue-ID: INT-1517
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I43e9f129c24ef33d93b550600e4dd850f881126b

9 files changed, 259 insertions, 255 deletions

diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DBTemplateReaderTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java
index f23b096..c3f85f5 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DBTemplateReaderTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java
@@ -35,19 +35,19 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class DBTemplateReaderTest {
+public class DbTemplateReaderTest {
 
     public static final String SOME_TEMPLATE = "someTemplate";
     public static final String KEY = "key";
     public static final String VALUE = "value";
     public static final long LMOD = 10L;
     private TemplateService service;
-    private DBTemplateReader dbTemplateReader;
+    private DbTemplateReader dbTemplateReader;
 
     @BeforeEach
     void setUp() {
         this.service = mock(TemplateService.class);
-        this.dbTemplateReader = new DBTemplateReader(this.service, new Gson());
+        this.dbTemplateReader = new DbTemplateReader(this.service, new Gson());
     }
 
     @Test
@@ -57,7 +57,7 @@ public class DBTemplateReaderTest {
 
         // when/then
         assertThrows(IOException.class,
-                () -> this.dbTemplateReader.readTemplate(SOME_TEMPLATE)
+            () -> this.dbTemplateReader.readTemplate(SOME_TEMPLATE)
         );
     }
 
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java
index 53f02da..b5304a7 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -35,44 +36,44 @@ import org.onap.pnfsimulator.event.EventData;
 import org.onap.pnfsimulator.event.EventDataRepository;
 
 public class IncrementProviderImplTest {
-  private IncrementProvider incrementProvider;
+    private IncrementProvider incrementProvider;
 
-  @Mock
-  private EventDataRepository eventDataRepositoryMock;
+    @Mock
+    private EventDataRepository eventDataRepositoryMock;
 
-  @BeforeEach
-  void setUp() {
-    eventDataRepositoryMock = mock(EventDataRepository.class);
-    incrementProvider = new IncrementProviderImpl(eventDataRepositoryMock);
-  }
+    @BeforeEach
+    void setUp() {
+        eventDataRepositoryMock = mock(EventDataRepository.class);
+        incrementProvider = new IncrementProviderImpl(eventDataRepositoryMock);
+    }
 
-  @Test
-  public void getAndIncrementTest() {
-    ArgumentCaptor<EventData> eventDataArgumentCaptor = ArgumentCaptor.forClass(EventData.class);
-    String eventId = "1";
-    int initialIncrementValue = 0;
-    int expectedValue = initialIncrementValue + 1;
-    EventData eventData = EventData.builder().id(eventId).incrementValue(initialIncrementValue).build();
-    Optional<EventData> optional = Optional.of(eventData);
+    @Test
+    public void getAndIncrementTest() {
+        ArgumentCaptor<EventData> eventDataArgumentCaptor = ArgumentCaptor.forClass(EventData.class);
+        String eventId = "1";
+        int initialIncrementValue = 0;
+        int expectedValue = initialIncrementValue + 1;
+        EventData eventData = EventData.builder().id(eventId).incrementValue(initialIncrementValue).build();
+        Optional<EventData> optional = Optional.of(eventData);
 
-    when(eventDataRepositoryMock.findById(eventId)).thenReturn(optional);
+        when(eventDataRepositoryMock.findById(eventId)).thenReturn(optional);
 
-    int value = incrementProvider.getAndIncrement(eventId);
+        int value = incrementProvider.getAndIncrement(eventId);
 
-    verify(eventDataRepositoryMock).save(eventDataArgumentCaptor.capture());
+        verify(eventDataRepositoryMock).save(eventDataArgumentCaptor.capture());
 
-    assertThat(value).isEqualTo(expectedValue);
-    assertThat(eventDataArgumentCaptor.getValue().getIncrementValue()).isEqualTo(expectedValue);
+        assertThat(value).isEqualTo(expectedValue);
+        assertThat(eventDataArgumentCaptor.getValue().getIncrementValue()).isEqualTo(expectedValue);
 
-  }
+    }
 
-  @Test
+    @Test
     public void shouldThrowOnNonExistingEvent() {
-    Optional<EventData> emptyOptional = Optional.empty();
-    String nonExistingEventId = "THIS_DOES_NOT_EXIST";
-    when(eventDataRepositoryMock.findById(nonExistingEventId)).thenReturn(emptyOptional);
+        Optional<EventData> emptyOptional = Optional.empty();
+        String nonExistingEventId = "THIS_DOES_NOT_EXIST";
+        when(eventDataRepositoryMock.findById(nonExistingEventId)).thenReturn(emptyOptional);
 
-    assertThrows(EventNotFoundException.class,
-        () -> incrementProvider.getAndIncrement(nonExistingEventId));
-  }
+        assertThrows(EventNotFoundException.class,
+            () -> incrementProvider.getAndIncrement(nonExistingEventId));
+    }
 }
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java
index f5c12c3..bf6f290 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.Collection;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,10 +38,10 @@ public class KeywordsExtractorValidTimestampTest {
     private KeywordsExtractor keywordsExtractor;
 
     private static final Collection VALID_TIMESTAMP_KEYWORDS = Arrays.asList(new Object[][]{
-        {"#Timestamp", 10},
-        {"#Timestamp12", 10 + 2},
-        {"1#Timestamp", 1 + 10},
-        {"1#Timestamp2", 1 + 10 +1}
+            {"#Timestamp", 10},
+            {"#Timestamp12", 10 + 2},
+            {"1#Timestamp", 1 + 10},
+            {"1#Timestamp2", 1 + 10 + 1}
     });
 
     public KeywordsExtractorValidTimestampTest(String keyword, Integer length) {
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java
index e67d4a3..e36bb28 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java
@@ -26,119 +26,121 @@ import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRI
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.Queue;
+
 import org.junit.jupiter.api.Test;
 
 class KeywordsHandlerTest {
 
-    private static final String TEMPLATE_JSON = "{\n" +
-        "  \"event\": {\n" +
-        "    \"commonEventHeader\": {\n" +
-        "      \"domain\": \"#RandomString\"\n" +
-        "    },\n" +
-        "    \"measurementsForVfScalingFields\": {\n" +
-        "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" +
-        "      \"additionalMeasurements\": {\n" +
-        "        \"name\": \"licenseUsage\",\n" +
-        "        \"extraFields\": {\n" +
-        "          \"name\": \"#RandomString(4)\",\n" +
-        "          \"value\": \"1\"\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
-
-    private static final String TEMPLATE_JSON_WITH_MANY_KEYWORDS_INSIDE_SINGLE_VALUE = "{\n" +
-        "  \"event\": {\n" +
-        "    \"commonEventHeader\": {\n" +
-        "      \"domain1\": \"#RandomString(1) #RandomString(2) #RandomString(3)\",\n" +
-        "      \"domain2\": \"1 #RandomString(1) 2\"\n" +
-        "    },\n" +
-        "    \"measurementsForVfScalingFields\": {\n" +
-        "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" +
-        "      \"additionalMeasurements\": {\n" +
-        "        \"name\": \"licenseUsage\",\n" +
-        "        \"extraFields\": {\n" +
-        "          \"value\": \"1\"\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    private static final String TEMPLATE_JSON = "{\n"
+            + "  \"event\": {\n"
+            + "    \"commonEventHeader\": {\n"
+            + "      \"domain\": \"#RandomString\"\n"
+            + "    },\n"
+            + "    \"measurementsForVfScalingFields\": {\n"
+            + "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n"
+            + "      \"additionalMeasurements\": {\n"
+            + "        \"name\": \"licenseUsage\",\n"
+            + "        \"extraFields\": {\n"
+            + "          \"name\": \"#RandomString(4)\",\n"
+            + "          \"value\": \"1\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+
+    private static final String TEMPLATE_JSON_WITH_MANY_KEYWORDS_INSIDE_SINGLE_VALUE = "{\n"
+            + "  \"event\": {\n"
+            + "    \"commonEventHeader\": {\n"
+            + "      \"domain1\": \"#RandomString(1) #RandomString(2) #RandomString(3)\",\n"
+            + "      \"domain2\": \"1 #RandomString(1) 2\"\n"
+            + "    },\n"
+            + "    \"measurementsForVfScalingFields\": {\n"
+            + "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n"
+            + "      \"additionalMeasurements\": {\n"
+            + "        \"name\": \"licenseUsage\",\n"
+            + "        \"extraFields\": {\n"
+            + "          \"value\": \"1\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
     private static final String TEMPLATE_JSON_WITH_ARRAY = "{\n"
-        + "    \"event\": {\n"
-        + "        \"commonEventHeader\": {\n"
-        + "            \"domain\": \"#RandomString(1)\",\n"
-        + "            \"version\": 2.0\n"
-        + "        },\n"
-        + "        \"measurementsForVfScalingFields\": {\n"
-        + "            \"additionalMeasurements\": [\n"
-        + "                {\n"
-        + "                    \"name\": \"licenseUsage\",\n"
-        + "                    \"arrayOfFields\": [\n"
-        + "                        {\n"
-        + "                            \"name\": \"G711AudioPort\",\n"
-        + "                            \"value\": \"1\"\n"
-        + "                        },\n"
-        + "                        {\n"
-        + "                            \"name\": [\"1\",\"2\"],\n"
-        + "                            \"value\": \"#RandomString(2)\"\n"
-        + "                        },\n"
-        + "                        {\n"
-        + "                            \"name\": \"G722AudioPort\",\n"
-        + "                            \"value\": \"1\"\n"
-        + "                        }\n"
-        + "                    ]\n"
-        + "                }\n"
-        + "            ]\n"
-        + "        }\n"
-        + "    }\n"
-        + "}";
-
-    private static final String TEMPLATE_ONE_INCREMENT_JSON = "{\n" +
-        "  \"event\": {\n" +
-        "    \"commonEventHeader\": {\n" +
-        "      \"domain\": \"#RandomString\"\n" +
-        "    },\n" +
-        "    \"measurementsForVfScalingFields\": {\n" +
-        "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" +
-        "      \"additionalMeasurements\": {\n" +
-        "        \"name\": \"licenseUsage\",\n" +
-        "        \"extraFields\": {\n" +
-        "          \"name\": \"#RandomString(4)\",\n" +
-        "          \"value\": \"#Increment\"\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
-
-    private static final String TEMPLATE_WITH_SIMPLE_VALUE= "\"#RandomString(4)\"";
+            + "    \"event\": {\n"
+            + "        \"commonEventHeader\": {\n"
+            + "            \"domain\": \"#RandomString(1)\",\n"
+            + "            \"version\": 2.0\n"
+            + "        },\n"
+            + "        \"measurementsForVfScalingFields\": {\n"
+            + "            \"additionalMeasurements\": [\n"
+            + "                {\n"
+            + "                    \"name\": \"licenseUsage\",\n"
+            + "                    \"arrayOfFields\": [\n"
+            + "                        {\n"
+            + "                            \"name\": \"G711AudioPort\",\n"
+            + "                            \"value\": \"1\"\n"
+            + "                        },\n"
+            + "                        {\n"
+            + "                            \"name\": [\"1\",\"2\"],\n"
+            + "                            \"value\": \"#RandomString(2)\"\n"
+            + "                        },\n"
+            + "                        {\n"
+            + "                            \"name\": \"G722AudioPort\",\n"
+            + "                            \"value\": \"1\"\n"
+            + "                        }\n"
+            + "                    ]\n"
+            + "                }\n"
+            + "            ]\n"
+            + "        }\n"
+            + "    }\n"
+            + "}";
+
+    private static final String TEMPLATE_ONE_INCREMENT_JSON = "{\n"
+            + "  \"event\": {\n"
+            + "    \"commonEventHeader\": {\n"
+            + "      \"domain\": \"#RandomString\"\n"
+            + "    },\n"
+            + "    \"measurementsForVfScalingFields\": {\n"
+            + "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n"
+            + "      \"additionalMeasurements\": {\n"
+            + "        \"name\": \"licenseUsage\",\n"
+            + "        \"extraFields\": {\n"
+            + "          \"name\": \"#RandomString(4)\",\n"
+            + "          \"value\": \"#Increment\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+
+    private static final String TEMPLATE_WITH_SIMPLE_VALUE = "\"#RandomString(4)\"";
 
     private static final String TEMPLATE_WITH_ARRAY_OF_PRIMITIVES = "[ 1, \"#RandomString(5)\", 3]";
 
-    private static final String TEMPLATE_TWO_INCREMENT_JSON = "{\n" +
-        "  \"event\": {\n" +
-        "    \"commonEventHeader\": {\n" +
-        "      \"domain\": \"#RandomString\"\n" +
-        "    },\n" +
-        "    \"measurementsForVfScalingFields\": {\n" +
-        "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" +
-        "      \"additionalMeasurements\": {\n" +
-        "        \"name\": \"licenseUsage\",\n" +
-        "        \"extraFields\": {\n" +
-        "          \"name\": \"#RandomString(4)\",\n" +
-        "          \"value\": \"#Increment\",\n" +
-        "          \"otherValue\": \"#Increment\"\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    private static final String TEMPLATE_TWO_INCREMENT_JSON = "{\n"
+            + "  \"event\": {\n"
+            + "    \"commonEventHeader\": {\n"
+            + "      \"domain\": \"#RandomString\"\n"
+            + "    },\n"
+            + "    \"measurementsForVfScalingFields\": {\n"
+            + "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n"
+            + "      \"additionalMeasurements\": {\n"
+            + "        \"name\": \"licenseUsage\",\n"
+            + "        \"extraFields\": {\n"
+            + "          \"name\": \"#RandomString(4)\",\n"
+            + "          \"value\": \"#Increment\",\n"
+            + "          \"otherValue\": \"#Increment\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
     private Gson gson = new Gson();
 
@@ -153,15 +155,15 @@ class KeywordsHandlerTest {
 
         // then
         String extraFields = resultJson
-            .get("event").getAsJsonObject()
-            .get("measurementsForVfScalingFields").getAsJsonObject()
-            .get("additionalMeasurements").getAsJsonObject()
-            .get("extraFields").getAsJsonObject()
-            .get("name").getAsString();
+                .get("event").getAsJsonObject()
+                .get("measurementsForVfScalingFields").getAsJsonObject()
+                .get("additionalMeasurements").getAsJsonObject()
+                .get("extraFields").getAsJsonObject()
+                .get("name").getAsString();
         String newDomain = resultJson
-            .get("event").getAsJsonObject()
-            .get("commonEventHeader").getAsJsonObject()
-            .get("domain").getAsString();
+                .get("event").getAsJsonObject()
+                .get("commonEventHeader").getAsJsonObject()
+                .get("domain").getAsString();
 
         assertThat(extraFields.length()).isEqualTo(4);
         assertThat(newDomain.length()).isEqualTo(DEFAULT_STRING_LENGTH);
@@ -178,16 +180,16 @@ class KeywordsHandlerTest {
 
         // then
         String newDomain1 = resultJson
-            .get("event").getAsJsonObject()
-            .get("commonEventHeader").getAsJsonObject()
-            .get("domain1").getAsString();
+                .get("event").getAsJsonObject()
+                .get("commonEventHeader").getAsJsonObject()
+                .get("domain1").getAsString();
         String newDomain2 = resultJson
-            .get("event").getAsJsonObject()
-            .get("commonEventHeader").getAsJsonObject()
-            .get("domain2").getAsString();
+                .get("event").getAsJsonObject()
+                .get("commonEventHeader").getAsJsonObject()
+                .get("domain2").getAsString();
 
-        assertThat(newDomain1.length()).isEqualTo(1+1+2+1+3);
-        assertThat(newDomain2.length()).isEqualTo(1+1+1+1+1);
+        assertThat(newDomain1.length()).isEqualTo(1 + 1 + 2 + 1 + 3);
+        assertThat(newDomain2.length()).isEqualTo(1 + 1 + 1 + 1 + 1);
     }
 
     @Test
@@ -225,17 +227,17 @@ class KeywordsHandlerTest {
 
         // then
         String actualValue = resultJson
-            .get("event").getAsJsonObject()
-            .get("measurementsForVfScalingFields").getAsJsonObject()
-            .get("additionalMeasurements").getAsJsonArray()
-            .get(0).getAsJsonObject()
-            .get("arrayOfFields").getAsJsonArray()
-            .get(1).getAsJsonObject()
-            .get("value").getAsString();
+                .get("event").getAsJsonObject()
+                .get("measurementsForVfScalingFields").getAsJsonObject()
+                .get("additionalMeasurements").getAsJsonArray()
+                .get(0).getAsJsonObject()
+                .get("arrayOfFields").getAsJsonArray()
+                .get(1).getAsJsonObject()
+                .get("value").getAsString();
         String otherActualValue = resultJson
-            .get("event").getAsJsonObject()
-            .get("commonEventHeader").getAsJsonObject()
-            .get("domain").getAsString();
+                .get("event").getAsJsonObject()
+                .get("commonEventHeader").getAsJsonObject()
+                .get("domain").getAsString();
 
         assertThat(otherActualValue.length()).isEqualTo(1);
         assertThat(actualValue.length()).isEqualTo(2);
@@ -253,11 +255,11 @@ class KeywordsHandlerTest {
 
         // then
         String actualValue = resultJson
-            .get("event").getAsJsonObject()
-            .get("measurementsForVfScalingFields").getAsJsonObject()
-            .get("additionalMeasurements").getAsJsonObject()
-            .get("extraFields").getAsJsonObject()
-            .get("value").getAsString();
+                .get("event").getAsJsonObject()
+                .get("measurementsForVfScalingFields").getAsJsonObject()
+                .get("additionalMeasurements").getAsJsonObject()
+                .get("extraFields").getAsJsonObject()
+                .get("value").getAsString();
 
         assertThat(actualValue).isEqualTo(newIncrementedValue.toString());
     }
@@ -270,7 +272,7 @@ class KeywordsHandlerTest {
         JsonObject templateJson = gson.fromJson(TEMPLATE_TWO_INCREMENT_JSON, JsonObject.class);
         KeywordsHandler keywordsHandler = new KeywordsHandler(new KeywordsExtractor(), new IncrementProvider() {
             Queue<Integer> sequenceOfValues = new LinkedList<>(
-                Arrays.asList(firstIncrementValue, secondIncrementValue));
+                    Arrays.asList(firstIncrementValue, secondIncrementValue));
 
             @Override
             public int getAndIncrement(String id) {
@@ -284,18 +286,18 @@ class KeywordsHandlerTest {
 
         // then
         String actualValue = resultJson
-            .get("event").getAsJsonObject()
-            .get("measurementsForVfScalingFields").getAsJsonObject()
-            .get("additionalMeasurements").getAsJsonObject()
-            .get("extraFields").getAsJsonObject()
-            .get("value").getAsString();
+                .get("event").getAsJsonObject()
+                .get("measurementsForVfScalingFields").getAsJsonObject()
+                .get("additionalMeasurements").getAsJsonObject()
+                .get("extraFields").getAsJsonObject()
+                .get("value").getAsString();
 
         String actualOtherValue = resultJson
-            .get("event").getAsJsonObject()
-            .get("measurementsForVfScalingFields").getAsJsonObject()
-            .get("additionalMeasurements").getAsJsonObject()
-            .get("extraFields").getAsJsonObject()
-            .get("otherValue").getAsString();
+                .get("event").getAsJsonObject()
+                .get("measurementsForVfScalingFields").getAsJsonObject()
+                .get("additionalMeasurements").getAsJsonObject()
+                .get("extraFields").getAsJsonObject()
+                .get("otherValue").getAsString();
 
         assertThat(actualValue).isEqualTo(secondIncrementValue.toString());
         assertThat(actualOtherValue).isEqualTo(secondIncrementValue.toString());
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
index 0196eb0..870c963 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
@@ -33,14 +33,13 @@ import org.onap.pnfsimulator.rest.model.FullEvent;
 import org.onap.pnfsimulator.rest.model.SimulatorParams;
 import org.onap.pnfsimulator.rest.model.SimulatorRequest;
 import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SSLAuthenticationHelper;
+import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.onap.pnfsimulator.simulator.scheduler.EventScheduler;
 import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
 import org.onap.pnfsimulator.simulatorconfig.SimulatorConfigService;
 import org.quartz.SchedulerException;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 
@@ -59,32 +58,32 @@ class SimulatorServiceTest {
 
     private static final String VES_URL = "http://0.0.0.0:8080";
     private static final Gson GSON = new Gson();
-    private static final JsonObject VALID_PATCH = GSON.fromJson("{\"event\": {\n" +
-            "    \"commonEventHeader\": {\n" +
-            "      \"sourceName\": \"SomeCustomSource\"}}}\n", JsonObject.class);
-    private static JsonObject VALID_FULL_EVENT = GSON.fromJson("{\"event\": {\n" +
-            "    \"commonEventHeader\": {\n" +
-            "      \"domain\": \"notification\",\n" +
-            "      \"eventName\": \"vFirewallBroadcastPackets\"\n" +
-            "    },\n" +
-            "    \"notificationFields\": {\n" +
-            "      \"arrayOfNamedHashMap\": [{\n" +
-            "        \"name\": \"A20161221.1031-1041.bin.gz\",\n" +
-            "        \"hashMap\": {\n" +
-            "          \"fileformatType\": \"org.3GPP.32.435#measCollec\"}}]}}}", JsonObject.class);
-    private static JsonObject FULL_EVENT_WITH_KEYWORDS = GSON.fromJson("{\"event\":{  \n" +
-            "      \"commonEventHeader\":{  \n" +
-            "         \"domain\":\"notification\",\n" +
-            "         \"eventName\":\"#RandomString(20)\",\n" +
-            "         \"eventOrderNo\":\"#Increment\"}}}", JsonObject.class);
+    private static final JsonObject VALID_PATCH = GSON.fromJson("{\"event\": {\n"
+        + "    \"commonEventHeader\": {\n"
+        + "      \"sourceName\": \"SomeCustomSource\"}}}\n", JsonObject.class);
+    private static JsonObject VALID_FULL_EVENT = GSON.fromJson("{\"event\": {\n"
+        + "    \"commonEventHeader\": {\n"
+        + "      \"domain\": \"notification\",\n"
+        + "      \"eventName\": \"vFirewallBroadcastPackets\"\n"
+        + "    },\n"
+        + "    \"notificationFields\": {\n"
+        + "      \"arrayOfNamedHashMap\": [{\n"
+        + "        \"name\": \"A20161221.1031-1041.bin.gz\",\n"
+        + "        \"hashMap\": {\n"
+        + "          \"fileformatType\": \"org.3GPP.32.435#measCollec\"}}]}}}", JsonObject.class);
+    private static JsonObject FULL_EVENT_WITH_KEYWORDS = GSON.fromJson("{\"event\":{  \n"
+        + "      \"commonEventHeader\":{  \n"
+        + "         \"domain\":\"notification\",\n"
+        + "         \"eventName\":\"#RandomString(20)\",\n"
+        + "         \"eventOrderNo\":\"#Increment\"}}}", JsonObject.class);
     private static final String SOME_CUSTOM_SOURCE = "SomeCustomSource";
-    private static final String CLOSED_LOOP_VNF ="ClosedLoopVNF";
+    private static final String CLOSED_LOOP_VNF = "ClosedLoopVNF";
     private static final String SAMPLE_ID = "sampleId";
     private static final EventData SAMPLE_EVENT = EventData.builder().id("1").build();
     private final ArgumentCaptor<JsonObject> bodyCaptor = ArgumentCaptor.forClass(JsonObject.class);
     private final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class);
     private final ArgumentCaptor<Integer> repeatCountCaptor = ArgumentCaptor
-            .forClass(Integer.class);
+        .forClass(Integer.class);
     private final ArgumentCaptor<String> templateNameCaptor = ArgumentCaptor.forClass(String.class);
     private final ArgumentCaptor<String> eventIdCaptor = ArgumentCaptor.forClass(String.class);
     private final ArgumentCaptor<String> vesUrlCaptor = ArgumentCaptor.forClass(String.class);
@@ -104,7 +103,7 @@ class SimulatorServiceTest {
         simulatorConfigService = mock(SimulatorConfigService.class);
 
         simulatorService = new SimulatorService(templatePatcher, templateReader,
-                eventScheduler, eventDataService, simulatorConfigService, new SSLAuthenticationHelper());
+            eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper());
     }
 
     @Test
@@ -112,7 +111,7 @@ class SimulatorServiceTest {
         String templateName = "validExampleMeasurementEvent.json";
         SimulatorParams simulatorParams = new SimulatorParams(VES_URL, 1, 1);
         SimulatorRequest simulatorRequest = new SimulatorRequest(simulatorParams,
-                templateName, VALID_PATCH);
+            templateName, VALID_PATCH);
 
         doReturn(SAMPLE_EVENT).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class));
 
@@ -125,8 +124,8 @@ class SimulatorServiceTest {
     void shouldTriggerEventWithDefaultVesUrlWhenNotProvidedInRequest() throws IOException, SchedulerException, GeneralSecurityException {
         String templateName = "validExampleMeasurementEvent.json";
         SimulatorRequest simulatorRequest = new SimulatorRequest(
-                new SimulatorParams("", 1, 1),
-                templateName, VALID_PATCH);
+            new SimulatorParams("", 1, 1),
+            templateName, VALID_PATCH);
 
         URL inDbVesUrl = new URL("http://0.0.0.0:8080/eventListener/v6");
         doReturn(SAMPLE_EVENT).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class));
@@ -140,23 +139,24 @@ class SimulatorServiceTest {
     @Test
     void shouldThrowJsonSyntaxWhenInvalidJson() {
         //given
-        JsonObject patch = GSON.fromJson("{\n" +
-                "  \"event\": {\n" +
-                "    \"commonEventHeader\": {\n" +
-                "      \"sourceName\": \"" + SOME_CUSTOM_SOURCE + "\"\n" +
-                "    }\n" +
-                "  }\n" +
-                "}\n", JsonObject.class);
+        JsonObject patch = GSON.fromJson("{\n"
+            + "  \"event\": {\n"
+            + "    \"commonEventHeader\": {\n"
+            + "      \"sourceName\": \""
+            + SOME_CUSTOM_SOURCE + "\"\n"
+            + "    }\n"
+            + "  }\n"
+            + "}\n", JsonObject.class);
         EventData eventData = EventData.builder().id("1").build();
 
         SimulatorParams simulatorParams = new SimulatorParams(VES_URL, 1, 1);
         SimulatorRequest simulatorRequest = new SimulatorRequest(simulatorParams,
-                "invalidJsonStructureEvent.json", patch);
+            "invalidJsonStructureEvent.json", patch);
         doReturn(eventData).when(eventDataService).persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class), any(JsonObject.class));
 
         //when
         assertThrows(JsonSyntaxException.class,
-                () -> simulatorService.triggerEvent(simulatorRequest));
+            () -> simulatorService.triggerEvent(simulatorRequest));
     }
 
     @Test
@@ -177,7 +177,7 @@ class SimulatorServiceTest {
 
     @Test
     void shouldSuccessfullySendOneTimeEventWithVesUrlWhenPassed() throws IOException, GeneralSecurityException {
-        SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher,templateReader, eventScheduler, eventDataService, simulatorConfigService, new SSLAuthenticationHelper()));
+        SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher, templateReader, eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper()));
 
         HttpClientAdapter adapterMock = mock(HttpClientAdapter.class);
         doNothing().when(adapterMock).send(eventContentCaptor.capture());
@@ -193,7 +193,7 @@ class SimulatorServiceTest {
 
     @Test
     void shouldSubstituteKeywordsAndSuccessfullySendOneTimeEvent() throws IOException, GeneralSecurityException {
-        SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher,templateReader, eventScheduler, eventDataService, simulatorConfigService, new SSLAuthenticationHelper()));
+        SimulatorService spiedTestedService = spy(new SimulatorService(templatePatcher, templateReader, eventScheduler, eventDataService, simulatorConfigService, new SslAuthenticationHelper()));
 
         HttpClientAdapter adapterMock = mock(HttpClientAdapter.class);
         doNothing().when(adapterMock).send(eventContentCaptor.capture());
@@ -210,18 +210,18 @@ class SimulatorServiceTest {
 
     private void assertEventHasExpectedStructure(String expectedVesUrl, String templateName, String sourceNameString) throws SchedulerException, IOException, GeneralSecurityException {
         verify(eventScheduler, times(1)).scheduleEvent(vesUrlCaptor.capture(), intervalCaptor.capture(),
-                repeatCountCaptor.capture(), templateNameCaptor.capture(), eventIdCaptor.capture(), bodyCaptor.capture());
+            repeatCountCaptor.capture(), templateNameCaptor.capture(), eventIdCaptor.capture(), bodyCaptor.capture());
         assertThat(vesUrlCaptor.getValue()).isEqualTo(expectedVesUrl);
         assertThat(intervalCaptor.getValue()).isEqualTo(1);
         assertThat(repeatCountCaptor.getValue()).isEqualTo(1);
         assertThat(templateNameCaptor.getValue()).isEqualTo(templateName);
         String actualSourceName = GSON.fromJson(bodyCaptor.getValue(), JsonObject.class)
-                .get("event").getAsJsonObject()
-                .get("commonEventHeader").getAsJsonObject()
-                .get("sourceName").getAsString();
+            .get("event").getAsJsonObject()
+            .get("commonEventHeader").getAsJsonObject()
+            .get("sourceName").getAsString();
         assertThat(actualSourceName).isEqualTo(sourceNameString);
         verify(eventDataService)
-                .persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class),
-                        any(JsonObject.class));
+            .persistEventData(any(JsonObject.class), any(JsonObject.class), any(JsonObject.class),
+                any(JsonObject.class));
     }
 }
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java
index 52e0d6a..818c8be 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java
@@ -31,23 +31,23 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 class TemplatePatcherTest {
 
-    private static final String TEMPLATE_JSON = "{\n" +
-            "  \"event\": {\n" +
-            "    \"commonEventHeader\": {\n" +
-            "      \"domain\": \"measurementsForVfScaling\"\n" +
-            "    },\n" +
-            "    \"measurementsForVfScalingFields\": {\n" +
-            "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n" +
-            "      \"additionalMeasurements\": {\n" +
-            "        \"name\": \"licenseUsage\",\n" +
-            "        \"extraFields\": {\n" +
-            "          \"name\": \"G711AudioPort\",\n" +
-            "          \"value\": \"1\"\n" +
-            "        }\n" +
-            "      }\n" +
-            "    }\n" +
-            "  }\n" +
-            "}";
+    private static final String TEMPLATE_JSON = "{\n"
+            + "  \"event\": {\n"
+            + "    \"commonEventHeader\": {\n"
+            + "      \"domain\": \"measurementsForVfScaling\"\n"
+            + "    },\n"
+            + "    \"measurementsForVfScalingFields\": {\n"
+            + "      \"measurementsForVfSclaingFieldsVersion\": 2.0,\n"
+            + "      \"additionalMeasurements\": {\n"
+            + "        \"name\": \"licenseUsage\",\n"
+            + "        \"extraFields\": {\n"
+            + "          \"name\": \"G711AudioPort\",\n"
+            + "          \"value\": \"1\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
     private TemplatePatcher templatePatcher;
     private Gson gson = new Gson();
@@ -109,9 +109,9 @@ class TemplatePatcherTest {
                 .get("commonEventHeader").getAsJsonObject()
                 .get("domain");
         assertThat(newDomain.isJsonObject()).isTrue();
-        JsonObject newDomainJO = newDomain.getAsJsonObject();
-        AssertionsForInterfaceTypes.assertThat(newDomainJO.keySet()).containsExactly("extraFields");
-        JsonObject newDomainExtraFields = newDomainJO.get("extraFields").getAsJsonObject();
+        JsonObject newDomainJsonObject = newDomain.getAsJsonObject();
+        AssertionsForInterfaceTypes.assertThat(newDomainJsonObject.keySet()).containsExactly("extraFields");
+        JsonObject newDomainExtraFields = newDomainJsonObject.get("extraFields").getAsJsonObject();
         AssertionsForInterfaceTypes.assertThat(newDomainExtraFields.keySet()).containsExactly("name", "value");
     }
 
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java
index 63c1b72..9eaab5c 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java
@@ -26,7 +26,7 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SSLAuthenticationHelper;
+import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -59,17 +59,18 @@ class HttpClientAdapterImplTest {
     }
 
     @Test
-    void sendShouldSuccessfullySendRequestGivenValidUrlUsingHTTPS() throws IOException {
+    void sendShouldSuccessfullySendRequestGivenValidUrlUsingHttps() throws IOException {
         assertAdapterSentRequest("https://valid-url:8443");
     }
 
     @Test
-    void shouldThrowExceptionWhenMalformedVesUrlPassed(){
-        assertThrows(MalformedURLException.class, () -> new HttpClientAdapterImpl("http://blablabla:VES-PORT", new SSLAuthenticationHelper()));
+    void shouldThrowExceptionWhenMalformedVesUrlPassed() {
+        assertThrows(MalformedURLException.class, () -> new HttpClientAdapterImpl("http://blablabla:VES-PORT", new SslAuthenticationHelper()));
     }
+
     @Test
-    void shouldCreateAdapterWithClientNotSupportingSSLConnection() throws IOException, GeneralSecurityException {
-        HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTPS_URL, new SSLAuthenticationHelper());
+    void shouldCreateAdapterWithClientNotSupportingSslConnection() throws IOException, GeneralSecurityException {
+        HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTPS_URL, new SslAuthenticationHelper());
         try {
             adapterWithHttps.send("sample");
         } catch (Exception actualException) {
@@ -79,7 +80,7 @@ class HttpClientAdapterImplTest {
 
     @Test
     void shouldCreateAdapterWithClientSupportingPlainConnectionOnly() throws IOException, GeneralSecurityException {
-        HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTP_URL, new SSLAuthenticationHelper());
+        HttpClientAdapter adapterWithHttps = new HttpClientAdapterImpl(HTTP_URL, new SslAuthenticationHelper());
         try {
             adapterWithHttps.send("sample");
         } catch (Exception actualException) {
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java
index 25ed84c..fed6bb6 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java
@@ -69,14 +69,14 @@ class EventJobTest {
         assertThat(bodyCaptor.getValue()).isEqualTo(body.toString());
     }
 
-    private JobExecutionContext createMockJobExecutionContext(String templateName, String eventId, String vesURL,
+    private JobExecutionContext createMockJobExecutionContext(String templateName, String eventId, String vesUrl,
         JsonObject body, HttpClientAdapter clientAdapter) {
 
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.put(TEMPLATE_NAME, templateName);
         jobDataMap.put(KEYWORDS_HANDLER, new KeywordsHandler(new KeywordsExtractor(), (id) -> 1));
         jobDataMap.put(EVENT_ID, eventId);
-        jobDataMap.put(VES_URL, vesURL);
+        jobDataMap.put(VES_URL, vesUrl);
         jobDataMap.put(BODY, body);
         jobDataMap.put(CLIENT_ADAPTER, clientAdapter);
 
diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java
index 84df5e9..d7cabb7 100644
--- a/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java
+++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
 import com.google.gson.JsonObject;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,7 +38,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SSLAuthenticationHelper;
+import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
@@ -57,7 +56,7 @@ class EventSchedulerTest {
     Scheduler quartzScheduler;
     
     @Mock
-    SSLAuthenticationHelper sslAuthenticationHelper;
+    SslAuthenticationHelper sslAuthenticationHelper;
 
     @BeforeEach
     void setUp() {