Add unit tests.

Signed-off-by: Youssef Aouichaoui <[email protected]>

Author: youssef3wi

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderUnitTests.java

@@ -1296,6 +1296,38 @@ void shouldUseCustomMappedNameMultiField() throws JSONException {
 		assertEquals(expected, mapping, true);
 	}
 
+	@Test // #2952
+	void shouldMapNullityParameters() throws JSONException {
+		// Given
+		String expected = """
+				{
+				   "properties": {
+				     "_class": {
+				       "type": "keyword",
+				       "index": false,
+				       "doc_values": false
+				     },
+				     "empty-field": {
+				       "type": "keyword",
+				       "null_value": "EMPTY",
+				       "fields": {
+				         "suffix": {
+				           "type": "keyword",
+				           "null_value": "EMPTY_TEXT"
+				         }
+				       }
+				     }
+				   }
+				 }
+				""";
+
+		// When
+		String result = getMappingBuilder().buildPropertyMapping(MultiFieldWithNullEmptyParameters.class);
+
+		// Then
+		assertEquals(expected, result, true);
+	}
+
 	// region entities
 
 	@Document(indexName = "ignore-above-index")
@@ -2570,5 +2602,14 @@ private static class MultiFieldMappedNameEntity {
 		@MultiField(mainField = @Field(type = FieldType.Text, mappedTypeName = "match_only_text"), otherFields = { @InnerField(suffix = "lower_case",
 				type = FieldType.Keyword, normalizer = "lower_case_normalizer", mappedTypeName = "constant_keyword") }) private String description;
 	}
+
+	@SuppressWarnings("unused")
+	private static class MultiFieldWithNullEmptyParameters {
+		@Nullable
+		@MultiField(
+				mainField = @Field(name = "empty-field", type = FieldType.Keyword, nullValue = "EMPTY", storeNullValue = true),
+				otherFields = {
+						@InnerField(suffix = "suffix", type = Keyword, nullValue = "EMPTY_TEXT") }) private List<String> emptyField;
+	}
 	// endregion
 }

src/test/java/org/springframework/data/elasticsearch/core/index/ReactiveMappingBuilderUnitTests.java

@@ -18,10 +18,14 @@
 import static org.skyscreamer.jsonassert.JSONAssert.*;
 import static org.springframework.data.elasticsearch.annotations.FieldType.*;
 
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.InnerField;
+import org.springframework.data.elasticsearch.annotations.MultiField;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
 import java.time.Instant;
+import java.util.List;
 
 import org.json.JSONException;
 import org.junit.jupiter.api.DisplayName;
@@ -78,6 +82,40 @@ void shouldWriteRuntimeFields() throws JSONException {
 
 		assertEquals(expected, mapping, true);
 	}
+	
+	@Test // #2952
+	void shouldMapNullityParameters() throws JSONException {
+		// Given
+		ReactiveMappingBuilder mappingBuilder = getReactiveMappingBuilder();
+		String expected = """
+				{
+				   "properties": {
+				     "_class": {
+				       "type": "keyword",
+				       "index": false,
+				       "doc_values": false
+				     },
+				     "empty-field": {
+				       "type": "keyword",
+				       "null_value": "EMPTY",
+				       "fields": {
+				         "suffix": {
+				           "type": "keyword",
+				           "null_value": "EMPTY_TEXT"
+				         }
+				       }
+				     }
+				   }
+				 }
+				""";
+		
+		// When
+		String result = Mono.defer(() -> mappingBuilder.buildReactivePropertyMapping(MultiFieldWithNullEmptyParameters.class))
+				.subscribeOn(Schedulers.parallel()).block();
+
+		// Then
+		assertEquals(expected, result, true);
+	}
 
 	// region entities
 	@Document(indexName = "runtime-fields")
@@ -88,5 +126,14 @@ private static class RuntimeFieldEntity {
 		@Field(type = Date, format = DateFormat.epoch_millis, name = "@timestamp")
 		@Nullable private Instant timestamp;
 	}
+
+	@SuppressWarnings("unused")
+	private static class MultiFieldWithNullEmptyParameters {
+		@Nullable
+		@MultiField(
+				mainField = @Field(name = "empty-field", type = FieldType.Keyword, nullValue = "EMPTY", storeNullValue = true),
+				otherFields = {
+						@InnerField(suffix = "suffix", type = Keyword, nullValue = "EMPTY_TEXT") }) private List<String> emptyField;
+	}
 	// endregion
 }