O1 PM Bulk support in DataCollector RAPP

Issue-ID: INT-1947

Signed-off-by: Stanislav Marszalek <s.marszalek2@partner.samsung.com>
Change-Id: I02d3684c98d563d7f386de2fdf032e930ac44b3f

5 files changed, 51 insertions, 35 deletions

diff --git a/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/CommonEventHeaderTest.java b/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/CommonEventHeaderTest.java
index 873ce1b..003463f 100644
--- a/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/CommonEventHeaderTest.java
+++ b/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/CommonEventHeaderTest.java
@@ -67,21 +67,21 @@ public class CommonEventHeaderTest {
     public void builder() {
         CommonEventHeader actual = createDumyCommonEventHeader();
 
-        assertEquals("version", actual.version);
-        assertEquals("domain", actual.domain);
-        assertEquals("eventId", actual.eventId);
-        assertEquals("eventName", actual.eventName);
-        assertEquals("eventType", actual.eventType);
-        assertEquals(12345L, actual.lastEpochMicrosec.longValue());
-        assertEquals("nfcNamingCode", actual.nfcNamingCode);
-        assertEquals("nfNamingCode", actual.nfNamingCode);
-        assertEquals("priority", actual.priority);
-        assertEquals("entityId", actual.reportingEntityId);
-        assertEquals("reportingEntityName", actual.reportingEntityName);
-        assertEquals(567, actual.sequence.intValue());
-        assertEquals("sourceId", actual.sourceId);
-        assertEquals("sourceName", actual.sourceName);
-        assertEquals(123456789L, actual.startEpochMicrosec.longValue());
+        assertEquals("version", actual.getVersion());
+        assertEquals("domain", actual.getDomain());
+        assertEquals("eventId", actual.getEventId());
+        assertEquals("eventName", actual.getEventName());
+        assertEquals("eventType", actual.getEventType());
+        assertEquals(12345L, actual.getLastEpochMicrosec().longValue());
+        assertEquals("nfcNamingCode", actual.getNfcNamingCode());
+        assertEquals("nfNamingCode", actual.getNfNamingCode());
+        assertEquals("priority", actual.getPriority());
+        assertEquals("entityId", actual.getReportingEntityId());
+        assertEquals("reportingEntityName", actual.getReportingEntityName());
+        assertEquals(567, actual.getSequence().intValue());
+        assertEquals("sourceId", actual.getSourceId());
+        assertEquals("sourceName", actual.getSourceName());
+        assertEquals(123456789L, actual.getStartEpochMicrosec().longValue());
         assertEquals("UTC+2", actual.timeZoneOffset);
 
 
diff --git a/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/EventTest.java b/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/EventTest.java
index 9b6700b..63bb440 100644
--- a/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/EventTest.java
+++ b/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/EventTest.java
@@ -15,6 +15,10 @@
 package org.onap.rapp.datacollector.entity.ves;
 
 import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.Test;
 
 public class EventTest {
@@ -27,6 +31,10 @@ public class EventTest {
         return Event.of(header, fields);
     }
 
+    public static List<Event> createDumyListOfEvents() {
+        return Collections.singletonList(createDumyEvent());
+    }
+
     public static Event createDumyEventWithUe() {
         CommonEventHeader header =
                 CommonEventHeaderTest.createDumyCommonEventHeader();
@@ -35,6 +43,10 @@ public class EventTest {
         return Event.of(header, fields);
     }
 
+    public static List<Event> createDumyListOfEventsWithUe() {
+        return Collections.singletonList(createDumyEventWithUe());
+    }
+
     @Test
     public void of() {
         CommonEventHeader header =
diff --git a/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/MeasurementFieldsTest.java b/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/MeasurementFieldsTest.java
index b3ca614..1283bd5 100644
--- a/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/MeasurementFieldsTest.java
+++ b/datacollector/src/test/java/org/onap/rapp/datacollector/entity/ves/MeasurementFieldsTest.java
@@ -48,7 +48,7 @@ public class MeasurementFieldsTest {
         MeasurementFields actual = createDummy(v);
 
         assertEquals(1234567L, actual.measurementInterval);
-        assertEquals("4.0", actual.measurementFieldsVersion);
+        assertEquals("4.0", actual.MEASUREMENT_FIELDS_VERSION);
         assertEquals(List.of(v), actual.additionalMeasurements);
     }
 }
diff --git a/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesParserImplTest.java b/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesParserImplTest.java
index f6cd0e5..ba2a22f 100644
--- a/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesParserImplTest.java
+++ b/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesParserImplTest.java
@@ -20,12 +20,15 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.stream.Collectors;
+
 import org.junit.Before;
 import org.junit.Test;
-import com.google.gson.JsonParseException;
 import org.onap.rapp.datacollector.entity.ves.Event;
 
+import com.google.gson.JsonParseException;
+
 public class VesParserImplTest {
+
     String testVesContent;
     VesParser parser = new VesParserImpl();
 
@@ -40,17 +43,17 @@ public class VesParserImplTest {
 
     @Test
     public void parse() {
-        Event actual = parser.parse(testVesContent);
-        assertEquals("4.0.1", actual.commonEventHeader.version);
-        assertEquals(1413378172000000L, (long) actual.commonEventHeader.lastEpochMicrosec);
-        assertEquals(1413378172000000L, (long) actual.commonEventHeader.startEpochMicrosec);
-        assertEquals(3, (int) actual.commonEventHeader.sequence);
-        assertEquals("measurement", actual.commonEventHeader.domain);
+        Event actual = parser.parse(testVesContent).get(0);
+        assertEquals("4.0.1", actual.commonEventHeader.getVersion());
+        assertEquals(1413378172000000L, (long) actual.commonEventHeader.getLastEpochMicrosec());
+        assertEquals(1413378172000000L, (long) actual.commonEventHeader.getStartEpochMicrosec());
+        assertEquals(3, (int) actual.commonEventHeader.getSequence());
+        assertEquals("measurement", actual.commonEventHeader.getDomain());
         assertEquals("UTC-05:30", actual.commonEventHeader.timeZoneOffset);
     }
 
     @Test(expected = JsonParseException.class)
     public void parseEmpty() {
-        Event actual = parser.parse("{\"event\":{}}");
+        Event actual = parser.parse("{\"event\":{}}").get(0);
     }
 }
\ No newline at end of file
diff --git a/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesRetrievalServiceTest.java b/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesRetrievalServiceTest.java
index 0126019..e1a285c 100644
--- a/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesRetrievalServiceTest.java
+++ b/datacollector/src/test/java/org/onap/rapp/datacollector/service/VesRetrievalServiceTest.java
@@ -15,7 +15,9 @@ package org.onap.rapp.datacollector.service;
 
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,13 +25,12 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.rapp.datacollector.entity.ves.Event;
+import org.onap.rapp.datacollector.entity.ves.EventTest;
 import org.onap.rapp.datacollector.service.configuration.DmaapRestReaderConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
-import org.onap.rapp.datacollector.entity.ves.EventTest;
 
 @RunWith(MockitoJUnitRunner.class)
 public class VesRetrievalServiceTest {
@@ -41,7 +42,7 @@ public class VesRetrievalServiceTest {
     private DmaapRestReaderConfiguration config;
 
     @Mock
-    private VesParser parser;
+    private ParserFactory parser;
 
     @Mock
     private VesPersister persister;
@@ -83,30 +84,30 @@ public class VesRetrievalServiceTest {
     public void whenRetrievedThenAlsoStored() {
         Mockito.when(config.getMeasurementsTopicUrl()).thenReturn("http://localhost/a-topic");
         Mockito.when(restTemplate.getForEntity("http://localhost/a-topic", String[].class))
-                .thenReturn(new ResponseEntity<String[]>(new String[]{"dead", "beef"}, HttpStatus.OK));
-        Mockito.when(parser.parse(Mockito.any(String.class)))
-                .thenReturn(EventTest.createDumyEvent());
+                .thenReturn(new ResponseEntity<>(new String[]{"dead", "beef"}, HttpStatus.OK));
+        Mockito.when(parser.getParsedEvents(Mockito.any(String.class)))
+                .thenReturn(EventTest.createDumyListOfEvents());
 
         service = new VesRetrievalService(restTemplate, parser, persister, config, ueHolder);
         service.retrieveAndStoreVesEvents();
 
-        Mockito.verify(persister, Mockito.times(2)).persists(Mockito.any(Event.class));
+        Mockito.verify(persister, Mockito.times(2)).persistAll(Mockito.any(List.class));
     }
 
     @Test
     public void whenRetrievedThenAlsoStoredWithUE() {
         Mockito.when(config.getMeasurementsTopicUrl()).thenReturn("http://localhost/a-topic");
         Mockito.when(restTemplate.getForEntity("http://localhost/a-topic", String[].class))
-                .thenReturn(new ResponseEntity<String[]>(new String[]{"dead", "beef"}, HttpStatus.OK));
-        Mockito.when(parser.parse(Mockito.any(String.class)))
-                .thenReturn(EventTest.createDumyEventWithUe());
+                .thenReturn(new ResponseEntity<>(new String[]{"dead", "beef"}, HttpStatus.OK));
+        Mockito.when(parser.getParsedEvents(Mockito.any(String.class)))
+                .thenReturn(EventTest.createDumyListOfEventsWithUe());
 
         UEHolder ueHolder = new UEHolder();
 
         service = new VesRetrievalService(restTemplate, parser, persister, config, ueHolder);
         service.retrieveAndStoreVesEvents();
 
-        Mockito.verify(persister, Mockito.times(2)).persists(Mockito.any(Event.class));
+        Mockito.verify(persister, Mockito.times(2)).persistAll(Mockito.any(List.class));
         Assert.assertEquals(ueHolder.getUes(), Set.of("emergency_samsung_01", "mobile_samsung_s10"));
     }
 }