feat(70552): refactoring and fixes

Author: bogdandina

src/main/java/fi/hsl/common/hfp/HfpParser.java

@@ -1,6 +1,5 @@
 package fi.hsl.common.hfp;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;

src/main/java/fi/hsl/common/passengercount/json/Apc.java

@@ -5,7 +5,7 @@
 
 import java.util.Date;
 
-@JsonIgnoreProperties
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Apc {
     public String desi;
     public String dir;

src/test/java/fi/hsl/common/passengercount/PassengerCountParserTest.java

@@ -18,17 +18,16 @@ public class PassengerCountParserTest {
 
     private final String TEST_TOPIC = "/hfp/v2/journey/ongoing/apc/bus/0022/01288";
 
+    @Test
+    public void parseJson_ignoreUnknownProperties_Test() throws Exception {
+        final var apc = parseJsonFromResources("src/test/resources/passenger-count-unknown-properties-sample.json").apc;
+        performAssertions(apc);
+    }
+
     @Test
     public void parseJsonTest() throws Exception {
         Apc apc = parseJsonFromResources("src/test/resources/passenger-count-sample.json").apc;
-        assertEquals("555", apc.desi);
-        assertEquals(12, (int) apc.oper);
-        assertEquals("GPS", apc.loc);
-        assertEquals("regular | defect | other", apc.vehiclecounts.countquality);
-        assertEquals(15, apc.vehiclecounts.vehicleload);
-        assertEquals(1, apc.vehiclecounts.doorcounts.size());
-        assertEquals("door1", apc.vehiclecounts.doorcounts.get(0).door);
-
+        performAssertions(apc);
     }
 
     private ApcJson parseJsonFromResources(String filename) throws Exception {
@@ -38,6 +37,16 @@ private ApcJson parseJsonFromResources(String filename) throws Exception {
         return apcJson;
     }
 
+    private void performAssertions(Apc apc) {
+        assertEquals("555", apc.desi);
+        assertEquals(12, (int) apc.oper);
+        assertEquals("GPS", apc.loc);
+        assertEquals("regular | defect | other", apc.vehiclecounts.countquality);
+        assertEquals(15, apc.vehiclecounts.vehicleload);
+        assertEquals(1, apc.vehiclecounts.doorcounts.size());
+        assertEquals("door1", apc.vehiclecounts.doorcounts.get(0).door);
+    }
+
     @Test
     public void convertJsonToProtobufMessageTest() throws Exception {
         ApcJson apcJson = parseJsonFromResources("src/test/resources/passenger-count-sample.json");

src/test/resources/passenger-count-unknown-properties-sample.json

@@ -0,0 +1,39 @@
+{
+  "APC": {
+    "desi": "555",
+    "dir": "1",
+    "oper": 12,
+    "veh": 10,
+    "tst": "2019-05-23T14:15:16.000Z",
+    "tsi": 1416308975,
+    "lat": 24.9435,
+    "long": 60.1967,
+    "odo": 45.12,
+    "oday": "2019-05-23",
+    "jrn": 1,
+    "invalid": true,
+    "line": 264,
+    "start": "13:40",
+    "loc": "GPS",
+    "stop": 1234567,
+    "route": "2551",
+    "vehiclecounts": {
+      "countquality": "regular | defect | other",
+      "vehicleload": 15,
+      "vehicleloadratio": 0.2,
+      "doorcounts": [
+        {
+          "door" : "door1",
+          "count": [
+            {
+              "class": "adult | child | pram | bike | wheelchair | other",
+              "in": 1,
+              "out": 2
+            }
+          ]
+        }
+      ],
+      "extensions": "extension data"
+    }
+  }
+}