From a25b8b8fd3e56bdf1fa71db6c72579cfcd91f688 Mon Sep 17 00:00:00 2001 From: Rishabh Maurya Date: Thu, 4 Apr 2024 11:24:24 -0700 Subject: [PATCH] Fix test Signed-off-by: Rishabh Maurya --- .../opensearch/index/mapper/DerivedField.java | 18 ++++++++++++++++++ .../index/mapper/DerivedFieldMapper.java | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/opensearch/index/mapper/DerivedField.java b/server/src/main/java/org/opensearch/index/mapper/DerivedField.java index 4d639d77687eb..aaf0ea0610acb 100644 --- a/server/src/main/java/org/opensearch/index/mapper/DerivedField.java +++ b/server/src/main/java/org/opensearch/index/mapper/DerivedField.java @@ -18,6 +18,7 @@ import org.opensearch.script.Script; import java.io.IOException; +import java.util.Objects; /** * DerivedField representation: expects a name, type and script. @@ -69,4 +70,21 @@ public Script getScript() { return script; } + @Override + public int hashCode() { + return Objects.hash(name, type, script); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + DerivedField other = (DerivedField) obj; + return Objects.equals(name, other.name) && Objects.equals(type, other.type) && Objects.equals(script, other.script); + } + } diff --git a/server/src/main/java/org/opensearch/index/mapper/DerivedFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/DerivedFieldMapper.java index ca6281d715651..c6ae71320c35c 100644 --- a/server/src/main/java/org/opensearch/index/mapper/DerivedFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/DerivedFieldMapper.java @@ -39,7 +39,7 @@ private static DerivedFieldMapper toType(FieldMapper in) { */ public static class Builder extends ParametrizedFieldMapper.Builder { // TODO: The type of parameter may change here if the actual underlying FieldType object is needed - private final Parameter type = Parameter.stringParam("type", false, m -> toType(m).type, "keyword"); + private final Parameter type = Parameter.stringParam("type", false, m -> toType(m).type, ""); private final Parameter