fix integ test

Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
opensearch-project · May 14, 2024 · d82d09a · d82d09a
1 parent db0159a
commit d82d09a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...src/main/resources/rest-api-spec/test/derived_fields/derived_field_index_mapping_defn.yml b/...src/main/resources/rest-api-spec/test/derived_fields/derived_field_index_mapping_defn.yml
diff --git a/server/src/main/java/org/opensearch/index/mapper/DerivedField.java b/server/src/main/java/org/opensearch/index/mapper/DerivedField.java
@@ -31,7 +31,7 @@ public class DerivedField implements Writeable, ToXContentFragment {
     private final Script script;
     private String sourceIndexedField;
     private Map<String, String> properties;
-    private boolean ignoreMalformed;
+    private Boolean ignoreMalformed;
     private String format;
 
     public DerivedField(String name, String type, Script script) {
@@ -49,7 +49,7 @@ public DerivedField(StreamInput in) throws IOException {
         }
         sourceIndexedField = in.readOptionalString();
         format = in.readOptionalString();
-        ignoreMalformed = Boolean.TRUE.equals(in.readOptionalBoolean());
+        ignoreMalformed = in.readOptionalBoolean();
     }
 
     @Override
@@ -82,7 +82,9 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par
         if (format != null) {
             builder.field("format", format);
         }
-        builder.field("ignore_malformed", ignoreMalformed);
+        if (ignoreMalformed != null) {
+            builder.field("ignore_malformed", ignoreMalformed);
+        }
         builder.endObject();
         return builder;
     }
@@ -150,7 +152,7 @@ public boolean equals(Object obj) {
             && Objects.equals(script, other.script)
             && Objects.equals(sourceIndexedField, other.sourceIndexedField)
             && Objects.equals(properties, other.properties)
-            && ignoreMalformed == other.ignoreMalformed
+            && Objects.equals(ignoreMalformed, other.ignoreMalformed)
             && Objects.equals(format, other.format);
     }
 }