Merge pull request #241 from rosette-api/RLPNC-7509-record-similarity-properties-validation-from-fork

RLPNC-7509: record similarity properties validation from fork

Author: iredpath

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

@@ -65,7 +65,7 @@ public static RecordSimilarityResult parseResult(JsonNode node, JsonParser jsonP
                         .map(JsonNode::asText)
                         .collect(Collectors.toList()))
                 .orElse(null);
-        List<String> info = Optional.ofNullable(node.get("info"))
+        final List<String> info = Optional.ofNullable(node.get("info"))
                 .map(jsonNode -> StreamSupport.stream(jsonNode.spliterator(), false)
                         .map(JsonNode::asText)
                         .collect(Collectors.toList()))

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

@@ -41,10 +41,10 @@ public RecordSimilarityResponse deserialize(JsonParser jsonParser, Deserializati
         final JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
         List<String> info = Optional.ofNullable(node.get("info"))
-                            .map(jsonNode -> StreamSupport.stream(jsonNode.spliterator(), false)
-                                                          .map(JsonNode::asText)
-                                                          .collect(Collectors.toList()))
-                            .orElse(null);
+                .map(jsonNode -> StreamSupport.stream(jsonNode.spliterator(), false)
+                        .map(JsonNode::asText)
+                        .collect(Collectors.toList()))
+                .orElse(null);
         String errorMessage = Optional.ofNullable(node.get("errorMessage")).map(JsonNode::asText).orElse(null);
 
         JsonNode resultsNode = node.get("results");

model/src/main/java/com/basistech/rosette/apimodel/recordsimilarity/RecordSimilarityProperties.java

@@ -20,7 +20,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Value;
 import lombok.extern.jackson.Jacksonized;
@@ -30,9 +29,8 @@
 @Value
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class RecordSimilarityProperties {
-    @Builder.Default
-    @NotNull @Valid Double threshold = 0.0;
-    @NotNull @Valid Boolean includeExplainInfo;
+    @Valid Double threshold;
+    @Valid Boolean includeExplainInfo;
     @Valid Map<String, String> parameters;
     @Valid String parameterUniverse;
 }

model/src/main/java/com/basistech/rosette/apimodel/recordsimilarity/RecordSimilarityResponse.java

@@ -41,6 +41,7 @@ public class RecordSimilarityResponse extends Response {
     /**
      * @return info messages to user, that could hold additional information about the results
      */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @Valid List<String> info;
 
     /**

model/src/main/java/com/basistech/rosette/apimodel/recordsimilarity/RecordSimilarityResult.java

@@ -33,6 +33,10 @@ public class RecordSimilarityResult {
     Map<String, RecordSimilarityField> left;
     Map<String, RecordSimilarityField> right;
     RecordSimilarityExplainInfo explainInfo;
+
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     List<String> error;
+
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     List<String> info;
 }