Skip to content

Commit 013bfe9

Browse files
author
Norbert Nagy
committed
RLPNC-7421 fixing nullpointer
1 parent 0ec0fa0 commit 013bfe9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ final class RecordSimilarityDeserializerUtilities {
3838
private RecordSimilarityDeserializerUtilities() {
3939
}
4040

41-
public static RecordSimilarityResult parseResult(JsonNode node, JsonParser jsonParser, @NotNull Map<String, RecordSimilarityFieldInfo> fields) throws IOException {
41+
public static RecordSimilarityResult parseResult(JsonNode node, JsonParser jsonParser, Map<String, RecordSimilarityFieldInfo> fields) throws IOException {
4242
final Double score = node.get("score") != null ? node.get("score").traverse(jsonParser.getCodec()).readValueAs(Double.class) : null;
4343
final RecordSimilarityExplainInfo explainInfo = node.get("explainInfo") != null ? node.get("explainInfo").traverse(jsonParser.getCodec()).readValueAs(RecordSimilarityExplainInfo.class) : null;
44-
Map<String, RecordSimilarityField> left = node.get("left") != null ? parseRecord(node.get("left"), jsonParser, fields) : null;
45-
Map<String, RecordSimilarityField> right = node.get("right") != null ? parseRecord(node.get("right"), jsonParser, fields) : null;
44+
Map<String, RecordSimilarityField> left = node.get("left") != null && fields != null ? parseRecord(node.get("left"), jsonParser, fields) : null;
45+
Map<String, RecordSimilarityField> right = node.get("right") != null && fields != null ? parseRecord(node.get("right"), jsonParser, fields) : null;
4646
return RecordSimilarityResult.builder()
4747
.score(score)
4848
.left(left)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public RecordSimilarityResponseDeserializer() {
4444
public RecordSimilarityResponse deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
4545
final JsonNode node = jsonParser.getCodec().readTree(jsonParser);
4646

47-
Map<String, RecordSimilarityFieldInfo> fields = node.get("fields").traverse(jsonParser.getCodec()).readValueAs(FIELDS_TYPE_REFERENCE);
47+
JsonNode fieldsNode = node.get("fields");
48+
49+
Map<String, RecordSimilarityFieldInfo> fields = fieldsNode != null ? node.get("fields").traverse(jsonParser.getCodec()).readValueAs(FIELDS_TYPE_REFERENCE) : null;
4850
String errorMessage = Optional.ofNullable(node.get("errorMessage")).map(JsonNode::asText).orElse(null);
4951

5052
JsonNode resultsNode = node.get("results");

0 commit comments

Comments
 (0)