remove commented out code, update method implementation

Author: Grace Calianese

json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityDeserializerUtilities.java

@@ -66,15 +66,16 @@ public static RecordSimilarityResult parseResult(JsonNode node, JsonParser jsonP
                 .build();
     }
 
-    static Map<String, RecordSimilarityField> parseRecordForResponse(JsonNode jsonNode, JsonParser jsonParser) throws IOException {
+    static Map<String, RecordSimilarityField> parseRecordForResponse(JsonNode jsonNode, JsonParser jsonParser) {
         final Map<String, RecordSimilarityField> recordMap = new HashMap<>();
-        final Iterator<Map.Entry<String, JsonNode>> recordsIterator = jsonNode.fields();
-        while (recordsIterator.hasNext()) {
-            final Map.Entry<String, JsonNode> recordEntry = recordsIterator.next();
-            final String fieldName = recordEntry.getKey();
-            RecordSimilarityField rsf = jsonNode.get(fieldName).traverse(jsonParser.getCodec()).readValueAs(UnknownField.class);
-            recordMap.put(fieldName, rsf);
-        }
+        jsonNode.fields().forEachRemaining(entry -> {
+            String fieldName = entry.getKey();
+            try {
+                recordMap.put(fieldName, jsonNode.get(fieldName).traverse(jsonParser.getCodec()).readValueAs(UnknownField.class));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
         return recordMap;
     }
 

json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityResponseDeserializer.java

@@ -16,26 +16,20 @@
 
 package com.basistech.rosette.apimodel.jackson.recordsimilaritydeserializers;
 
-//import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityFieldInfo;
 import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityResponse;
 import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityResult;
 import com.fasterxml.jackson.core.JsonParser;
-//import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-//import java.util.Map;
 import java.util.Optional;
 
 public class RecordSimilarityResponseDeserializer extends StdDeserializer<RecordSimilarityResponse> {
 
-//    private static final TypeReference<Map<String, RecordSimilarityFieldInfo>> FIELDS_TYPE_REFERENCE = new TypeReference<>() {
-//    };
-
     public RecordSimilarityResponseDeserializer() {
         super(RecordSimilarityResponse.class);
     }