RLPNC-7501 record similarity left and right object correct deserialization

Norbert Nagy · Norbert Nagy · commit 0ec0fa0d6e7f · 2024-04-12T15:49:57.000+02:00
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/ApiModelMixinModule.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/ApiModelMixinModule.java
@@ -27,8 +27,8 @@
 import com.basistech.rosette.apimodel.jackson.recordsimilaritydeserializers.AddressFieldDeserializer;
 import com.basistech.rosette.apimodel.jackson.recordsimilaritydeserializers.DateFieldDeserializer;
 import com.basistech.rosette.apimodel.jackson.recordsimilaritydeserializers.NameFieldDeserializer;
-import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityResult;
-import com.basistech.rosette.apimodel.jackson.recordsimilaritydeserializers.RecordSimilarityResultDeserializer;
+import com.basistech.rosette.apimodel.jackson.recordsimilaritydeserializers.RecordSimilarityResponseDeserializer;
+import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityResponse;
 import com.basistech.rosette.apimodel.recordsimilarity.records.AddressField;
 import com.basistech.rosette.apimodel.recordsimilarity.records.DateField;
 import com.basistech.rosette.apimodel.recordsimilarity.records.NameField;
@@ -98,7 +98,7 @@ public void setupModule(Module.SetupContext context) {
         deserializers.addDeserializer(DateField.class, new DateFieldDeserializer());
         deserializers.addDeserializer(AddressField.class, new AddressFieldDeserializer());
         deserializers.addDeserializer(RecordSimilarityRequest.class, new RecordSimilarityRequestDeserializer());
-        deserializers.addDeserializer(RecordSimilarityResult.class, new RecordSimilarityResultDeserializer());
+        deserializers.addDeserializer(RecordSimilarityResponse.class, new RecordSimilarityResponseDeserializer());
         context.addDeserializers(deserializers);
     }
 
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityDeserializerUtilities.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityDeserializerUtilities.java
@@ -21,9 +21,11 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityExplainInfo;
+import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityResult;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
-import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 import com.basistech.rosette.apimodel.recordsimilarity.RecordSimilarityFieldInfo;
 import com.basistech.rosette.apimodel.recordsimilarity.records.AddressField;
@@ -33,9 +35,23 @@
 
 final class RecordSimilarityDeserializerUtilities {
 
-    private RecordSimilarityDeserializerUtilities() { }
+    private RecordSimilarityDeserializerUtilities() {
+    }
+
+    public static RecordSimilarityResult parseResult(JsonNode node, JsonParser jsonParser, @NotNull Map<String, RecordSimilarityFieldInfo> fields) throws IOException {
+        final Double score = node.get("score") != null ? node.get("score").traverse(jsonParser.getCodec()).readValueAs(Double.class) : null;
+        final RecordSimilarityExplainInfo explainInfo = node.get("explainInfo") != null ? node.get("explainInfo").traverse(jsonParser.getCodec()).readValueAs(RecordSimilarityExplainInfo.class) : null;
+        Map<String, RecordSimilarityField> left = node.get("left") != null ? parseRecord(node.get("left"), jsonParser, fields) : null;
+        Map<String, RecordSimilarityField> right = node.get("right") != null ? parseRecord(node.get("right"), jsonParser, fields) : null;
+        return RecordSimilarityResult.builder()
+                .score(score)
+                .left(left)
+                .right(right)
+                .explainInfo(explainInfo)
+                .build();
+    }
 
-    static Map<String, RecordSimilarityField> parseRecord(JsonNode jsonNode, @Valid Map<String, RecordSimilarityFieldInfo> fields, JsonParser jsonParser) throws IOException {
+    static Map<String, RecordSimilarityField> parseRecord(JsonNode jsonNode, JsonParser jsonParser, @NotNull Map<String, RecordSimilarityFieldInfo> fields) throws IOException {
         final Iterator<Map.Entry<String, JsonNode>> recordsIterator = jsonNode.fields();
         final Map<String, RecordSimilarityField> recordMap = new HashMap<>();
         while (recordsIterator.hasNext()) {
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityRequestDeserializer.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityRequestDeserializer.java
@@ -67,7 +67,7 @@ private static List<Map<String, RecordSimilarityField>> parseRecords(final JsonN
                                                                          final JsonParser jsonParser) throws IOException {
         final List<Map<String, RecordSimilarityField>> records = new ArrayList<>();
         for (JsonNode recordNode : arrayNode) {
-            records.add(RecordSimilarityDeserializerUtilities.parseRecord(recordNode, fields, jsonParser));
+            records.add(RecordSimilarityDeserializerUtilities.parseRecord(recordNode, jsonParser, fields));
         }
         return records;
     }
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityResponseDeserializer.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityResponseDeserializer.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 Basis Technology Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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);
+    }
+
+    @Override
+    public RecordSimilarityResponse deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+        final JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+
+        Map<String, RecordSimilarityFieldInfo> fields = node.get("fields").traverse(jsonParser.getCodec()).readValueAs(FIELDS_TYPE_REFERENCE);
+        String errorMessage = Optional.ofNullable(node.get("errorMessage")).map(JsonNode::asText).orElse(null);
+
+        JsonNode resultsNode = node.get("results");
+        List<RecordSimilarityResult> results = new ArrayList<>(resultsNode.size());
+        for (JsonNode resultNode : resultsNode) {
+            results.add(RecordSimilarityDeserializerUtilities.parseResult(resultNode, jsonParser, fields));
+        }
+
+        return RecordSimilarityResponse.builder()
+                .fields(fields)
+                .results(results)
+                .errorMessage(errorMessage)
+                .build();
+    }
+}
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityResultDeserializer.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/recordsimilaritydeserializers/RecordSimilarityResultDeserializer.java
diff --git a/model/src/main/java/com/basistech/rosette/apimodel/recordsimilarity/RecordSimilarityResponse.java b/model/src/main/java/com/basistech/rosette/apimodel/recordsimilarity/RecordSimilarityResponse.java
@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Value;
-import lombok.extern.jackson.Jacksonized;
 
 import com.basistech.rosette.apimodel.Response;
 
@@ -33,7 +32,6 @@
  */
 @Value
 @Builder
-@Jacksonized
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class RecordSimilarityResponse extends Response {
     @Valid Map<String, RecordSimilarityFieldInfo> fields;

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private static List<Map<String, RecordSimilarityField>> parseRecords(final JsonN`
`67`	`67`	`final JsonParser jsonParser) throws IOException {`
`68`	`68`	`final List<Map<String, RecordSimilarityField>> records = new ArrayList<>();`
`69`	`69`	`for (JsonNode recordNode : arrayNode) {`
`70`		`- records.add(RecordSimilarityDeserializerUtilities.parseRecord(recordNode, fields, jsonParser));`
	`70`	`+ records.add(RecordSimilarityDeserializerUtilities.parseRecord(recordNode, jsonParser, fields));`
`71`	`71`	`}`
`72`	`72`	`return records;`
`73`	`73`	`}`