Fix FieldType mapping.

Original PullRequest #2026
Closes #2024

(cherry picked from commit f7a6a97)
(cherry picked from commit f3f9ca4)

Author: sothawo

Diff for: src/main/java/org/springframework/data/elasticsearch/annotations/DynamicMappingValue.java

@@ -17,10 +17,20 @@
 
 /**
  * values for the {@link DynamicMapping annotation}
- * 
+ *
  * @author Peter-Josef Meisch
  * @since 4.0
  */
 public enum DynamicMappingValue {
-	True, False, Strict
+	True("true"), False("false"), Strict("strict");
+
+	private final String mappedName;
+
+	DynamicMappingValue(String mappedName) {
+		this.mappedName = mappedName;
+	}
+
+	public String getMappedName() {
+		return mappedName;
+	}
 }

Diff for: src/main/java/org/springframework/data/elasticsearch/annotations/FieldType.java

@@ -26,40 +26,51 @@
  * @author Morgan Lutz
  */
 public enum FieldType {
-	Auto, //
-	Text, //
-	Keyword, //
-	Long, //
-	Integer, //
-	Short, //
-	Byte, //
-	Double, //
-	Float, //
-	Half_Float, //
-	Scaled_Float, //
-	Date, //
-	Date_Nanos, //
-	Boolean, //
-	Binary, //
-	Integer_Range, //
-	Float_Range, //
-	Long_Range, //
-	Double_Range, //
-	Date_Range, //
-	Ip_Range, //
-	Object, //
-	Nested, //
-	Ip, //
-	TokenCount, //
-	Percolator, //
-	Flattened, //
-	Search_As_You_Type, //
+	Auto("auto"), //
+	Text("text"), //
+	Keyword("keyword"), //
+	Long("long"), //
+	Integer("integer"), //
+	Short("short"), //
+	Byte("byte"), //
+	Double("double"), //
+	Float("float"), //
+	Half_Float("half_float"), //
+	Scaled_Float("scaled_float"), //
+	Date("date"), //
+	Date_Nanos("date_nanos"), //
+	Boolean("boolean"), //
+	Binary("binary"), //
+	Integer_Range("integer_range"), //
+	Float_Range("float_range"), //
+	Long_Range("long_range"), //
+	Double_Range("double_range"), //
+	Date_Range("date_range"), //
+	Ip_Range("ip_range"), //
+	Object("object"), //
+	Nested("nested"), //
+	Ip("ip"), //
+	TokenCount("token_count"), //
+	Percolator("percolator"), //
+	Flattened("flattened"), //
+	Search_As_You_Type("search_as_you_type"), //
 	/** @since 4.1 */
-	Rank_Feature, //
+	Rank_Feature("rank_feature"), //
 	/** @since 4.1 */
-	Rank_Features, //
+	Rank_Features("rank_features"), //
 	/** since 4.2 */
-	Wildcard, //
+	Wildcard("wildcard"), //
 	/** @since 4.2 */
-	Dense_Vector //
+	Dense_Vector("dense_vector") //
+	;
+
+	private final String mappedName;
+
+	FieldType(String mappedName) {
+		this.mappedName = mappedName;
+	}
+
+	public String getMappedName() {
+		return mappedName;
+	}
 }

Diff for: src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java

@@ -156,10 +156,9 @@ private void mapEntity(XContentBuilder builder, @Nullable ElasticsearchPersisten
 		boolean writeNestedProperties = !isRootObject && (isAnyPropertyAnnotatedWithField(entity) || nestedOrObjectField);
 		if (writeNestedProperties) {
 
-			String type = nestedOrObjectField ? fieldType.toString().toLowerCase()
-					: FieldType.Object.toString().toLowerCase();
-			builder.startObject(nestedObjectFieldName).field(FIELD_PARAM_TYPE, type);
+			String type = nestedOrObjectField ? fieldType.getMappedName() : FieldType.Object.getMappedName();
 
+			builder.startObject(nestedObjectFieldName).field(FIELD_PARAM_TYPE, type);
 			if (nestedOrObjectField && FieldType.Nested == fieldType && parentFieldAnnotation != null
 					&& parentFieldAnnotation.includeInParent()) {
 				builder.field("include_in_parent", true);
@@ -364,7 +363,7 @@ private void applyDisabledPropertyMapping(XContentBuilder builder, Elasticsearch
 			}
 
 			builder.startObject(property.getFieldName()) //
-					.field(FIELD_PARAM_TYPE, field.type().name().toLowerCase()) //
+					.field(FIELD_PARAM_TYPE, field.type().getMappedName()) //
 					.field(MAPPING_ENABLED, false) //
 					.endObject(); //
 		} catch (Exception e) {
@@ -392,7 +391,7 @@ private void addSingleFieldMapping(XContentBuilder builder, ElasticsearchPersist
 		builder.startObject(property.getFieldName());
 
 		if (nestedOrObjectField && dynamicMapping != null) {
-			builder.field(TYPE_DYNAMIC, dynamicMapping.value().name().toLowerCase());
+			builder.field(TYPE_DYNAMIC, dynamicMapping.value().getMappedName());
 		}
 
 		addFieldMappingParameters(builder, annotation, nestedOrObjectField);
@@ -441,7 +440,7 @@ private void addMultiFieldMapping(XContentBuilder builder, ElasticsearchPersiste
 		builder.startObject(property.getFieldName());
 
 		if (nestedOrObjectField && dynamicMapping != null) {
-			builder.field(TYPE_DYNAMIC, dynamicMapping.value().name().toLowerCase());
+			builder.field(TYPE_DYNAMIC, dynamicMapping.value().getMappedName());
 		}
 
 		addFieldMappingParameters(builder, annotation.mainField(), nestedOrObjectField);

Diff for: src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java

@@ -71,7 +71,7 @@ public final class MappingParameters {
 	static final String FIELD_PARAM_NULL_VALUE = "null_value";
 	static final String FIELD_PARAM_POSITION_INCREMENT_GAP = "position_increment_gap";
 	static final String FIELD_PARAM_POSITIVE_SCORE_IMPACT = "positive_score_impact";
-  	static final String FIELD_PARAM_DIMS = "dims";
+	static final String FIELD_PARAM_DIMS = "dims";
 	static final String FIELD_PARAM_SCALING_FACTOR = "scaling_factor";
 	static final String FIELD_PARAM_SEARCH_ANALYZER = "search_analyzer";
 	static final String FIELD_PARAM_STORE = "store";
@@ -101,7 +101,7 @@ public final class MappingParameters {
 	private final NullValueType nullValueType;
 	private final Integer positionIncrementGap;
 	private final boolean positiveScoreImpact;
-  	private final Integer dims;
+	private final Integer dims;
 	private final String searchAnalyzer;
 	private final double scalingFactor;
 	private final Similarity similarity;
@@ -163,7 +163,8 @@ private MappingParameters(Field field) {
 		positiveScoreImpact = field.positiveScoreImpact();
 		dims = field.dims();
 		if (type == FieldType.Dense_Vector) {
-			Assert.isTrue(dims >= 1 && dims <= 2048, "Invalid required parameter! Dense_Vector value \"dims\" must be between 1 and 2048.");
+			Assert.isTrue(dims >= 1 && dims <= 2048,
+					"Invalid required parameter! Dense_Vector value \"dims\" must be between 1 and 2048.");
 		}
 		Assert.isTrue(field.enabled() || type == FieldType.Object, "enabled false is only allowed for field type object");
 		enabled = field.enabled();
@@ -205,7 +206,8 @@ private MappingParameters(InnerField field) {
 		positiveScoreImpact = field.positiveScoreImpact();
 		dims = field.dims();
 		if (type == FieldType.Dense_Vector) {
-			Assert.isTrue(dims >= 1 && dims <= 2048, "Invalid required parameter! Dense_Vector value \"dims\" must be between 1 and 2048.");
+			Assert.isTrue(dims >= 1 && dims <= 2048,
+					"Invalid required parameter! Dense_Vector value \"dims\" must be between 1 and 2048.");
 		}
 		enabled = true;
 		eagerGlobalOrdinals = field.eagerGlobalOrdinals();
@@ -229,7 +231,7 @@ public void writeTypeAndParametersTo(XContentBuilder builder) throws IOException
 		}
 
 		if (type != FieldType.Auto) {
-			builder.field(FIELD_PARAM_TYPE, type.name().toLowerCase());
+			builder.field(FIELD_PARAM_TYPE, type.getMappedName());
 
 			if (type == FieldType.Date) {
 				List<String> formats = new ArrayList<>();