checkstyle and UnknownField implementation change

Author: Grace Calianese

api/src/test/java/com/basistech/rosette/api/RosetteAPITest.java

@@ -241,43 +241,15 @@ private static Stream<Arguments> testMatchRecordMissingFieldParameters() throws
     @MethodSource("testMatchRecordMissingFieldParameters")
     void testMatchRecordMissingField(String testFilename, String responseStr, int statusCode) throws IOException {
         setStatusCodeResponse(responseStr, statusCode);
-            readValueRecordMatcher(testFilename);
-            assertEquals("{\n" +
-                    "  \"results\": [\n" +
-                    "    {\n" +
-                    "      \"score\": 0.0,\n" +
-                    "      \"left\": {\n" +
-                    "        \"dob2\": \"1993/04/16\",\n" +
-                    "        \"dob\": \"1993-04-16\",\n" +
-                    "        \"primaryName\": {\n" +
-                    "          \"data\": \"Ethan R\",\n" +
-                    "          \"language\": \"eng\",\n" +
-                    "          \"entityType\": \"PERSON\"\n" +
-                    "        },\n" +
-                    "        \"addr\": \"123 Roadlane Ave\"\n" +
-                    "      },\n" +
-                    "      \"right\": {\n" +
-                    "        \"dob\": \"1993-04-16\",\n" +
-                    "        \"primaryName\": \"Seth R\"\n" +
-                    "      },\n" +
-                    "      \"error\": \"Field 'primaryName' not found in field mapping\"\n" +
-                    "    },\n" +
-                    "    {\n" +
-                    "      \"score\": 0.0,\n" +
-                    "      \"left\": {\n" +
-                    "        \"dob\": \"1993-04-16\",\n" +
-                    "        \"primaryName\": \"Evan R\"\n" +
-                    "      },\n" +
-                    "      \"right\": {\n" +
-                    "        \"dob2\": \"1993/04/16\",\n" +
-                    "        \"dob\": \"1993-04-16\",\n" +
-                    "        \"primaryName\": \"Ivan R\",\n" +
-                    "        \"addr\": \"123 Roadlane Ave\"\n" +
-                    "      },\n" +
-                    "      \"error\": \"Field 'primaryName' not found in field mapping\"\n" +
-                    "    }\n" +
-                    "  ]\n" +
-                    "}", responseStr);
+        readValueRecordMatcher(testFilename);
+        assertEquals("{\"results\":[{\"score\":0.0,\"left\":{\"dob2\":\"1993/04/16\","
+                    + "\"dob\":\"1993-04-16\",\"primaryName\":{\"data\":\"Ethan R\",\"language\":\"eng\","
+                    + "\"entityType\":\"PERSON\"},\"addr\":\"123 Roadlane Ave\"},\"right\":{\"dob\":\"1993-04-16\","
+                    + "\"primaryName\":\"Seth R\"},\"error\":\"Field 'primaryName' not found in field mapping\"},"
+                    + "{\"score\":0.0,\"left\":{\"dob\":\"1993-04-16\",\"primaryName\":\"Evan R\"},"
+                    + "\"right\":{\"dob2\":\"1993/04/16\",\"dob\":\"1993-04-16\",\"primaryName\":\"Ivan R\","
+                    + "\"addr\":\"123 Roadlane Ave\"},\"error\":\"Field 'primaryName' not found in field mapping\"}]}",
+                    responseStr);
     }
 
     private static Stream<Arguments> testMatchRecordNullFieldParameters() throws IOException {

api/src/test/mock-data/response/rni-1-record-similarity-missing-field.json

@@ -1,36 +1 @@
-{
-  "results": [
-    {
-      "score": 0.0,
-      "left": {
-        "dob2": "1993/04/16",
-        "dob": "1993-04-16",
-        "primaryName": {
-          "data": "Ethan R",
-          "language": "eng",
-          "entityType": "PERSON"
-        },
-        "addr": "123 Roadlane Ave"
-      },
-      "right": {
-        "dob": "1993-04-16",
-        "primaryName": "Seth R"
-      },
-      "error": "Field 'primaryName' not found in field mapping"
-    },
-    {
-      "score": 0.0,
-      "left": {
-        "dob": "1993-04-16",
-        "primaryName": "Evan R"
-      },
-      "right": {
-        "dob2": "1993/04/16",
-        "dob": "1993-04-16",
-        "primaryName": "Ivan R",
-        "addr": "123 Roadlane Ave"
-      },
-      "error": "Field 'primaryName' not found in field mapping"
-    }
-  ]
-}
+{"results":[{"score":0.0,"left":{"dob2":"1993/04/16","dob":"1993-04-16","primaryName":{"data":"Ethan R","language":"eng","entityType":"PERSON"},"addr":"123 Roadlane Ave"},"right":{"dob":"1993-04-16","primaryName":"Seth R"},"error":"Field 'primaryName' not found in field mapping"},{"score":0.0,"left":{"dob":"1993-04-16","primaryName":"Evan R"},"right":{"dob2":"1993/04/16","dob":"1993-04-16","primaryName":"Ivan R","addr":"123 Roadlane Ave"},"error":"Field 'primaryName' not found in field mapping"}]}

model/src/main/java/com/basistech/rosette/apimodel/recordsimilarity/records/UnknownField.java

@@ -16,8 +16,10 @@
 
 package com.basistech.rosette.apimodel.recordsimilarity.records;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -36,19 +38,16 @@ public UnknownField(JsonNode data) {
         this.data = data;
     }
 
-    //There's probably a better way to do this
     @JsonValue
     public Object getData() {
         if (data == null) {
             return "";
         } else {
             if (data.isObject()) {
-                Iterator<Map.Entry<String, JsonNode>> fields = data.fields();
+                List<Map.Entry<String, JsonNode>> list = new ArrayList<>();
+                data.fields().forEachRemaining(list::add);
                 Map<String, JsonNode> map = new LinkedHashMap<>();
-                while (fields.hasNext()) {
-                    Map.Entry<String, JsonNode> fieldEntry = fields.next();
-                    map.put(fieldEntry.getKey(), fieldEntry.getValue());
-                }
+                list.stream().forEach(fieldEntry -> map.put(fieldEntry.getKey(), fieldEntry.getValue()));
                 try {
                     ObjectMapper mapper = new ObjectMapper();
                     String jsonString = mapper.writeValueAsString(map);