Refactor MappingElasticsearchConverter

pom.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.2.0-SNAPSHOT</version>
+	<version>4.2.0-GH-1676-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java

@@ -277,28 +277,26 @@ private <T> T updateIndexedObject(T entity, IndexedObjectInformation indexedObje
 				routingResolver);
 		adaptibleEntity.populateIdIfNecessary(indexedObjectInformation.getId());
 
-		ElasticsearchPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(entity.getClass());
-		PersistentPropertyAccessor<Object> propertyAccessor = persistentEntity.getPropertyAccessor(entity);
-
-		if (indexedObjectInformation.getSeqNo() != null && indexedObjectInformation.getPrimaryTerm() != null
-				&& persistentEntity.hasSeqNoPrimaryTermProperty()) {
-			ElasticsearchPersistentProperty seqNoPrimaryTermProperty = persistentEntity.getSeqNoPrimaryTermProperty();
-			propertyAccessor.setProperty(seqNoPrimaryTermProperty,
-					new SeqNoPrimaryTerm(indexedObjectInformation.getSeqNo(), indexedObjectInformation.getPrimaryTerm()));
-		}
+		ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntityFor(entity.getClass());
+		if (persistentEntity != null) {
+			PersistentPropertyAccessor<Object> propertyAccessor = persistentEntity.getPropertyAccessor(entity);
+
+			if (indexedObjectInformation.getSeqNo() != null && indexedObjectInformation.getPrimaryTerm() != null
+					&& persistentEntity.hasSeqNoPrimaryTermProperty()) {
+				ElasticsearchPersistentProperty seqNoPrimaryTermProperty = persistentEntity.getSeqNoPrimaryTermProperty();
+				propertyAccessor.setProperty(seqNoPrimaryTermProperty,
+						new SeqNoPrimaryTerm(indexedObjectInformation.getSeqNo(), indexedObjectInformation.getPrimaryTerm()));
+			}
 
-		if (indexedObjectInformation.getVersion() != null && persistentEntity.hasVersionProperty()) {
-			ElasticsearchPersistentProperty versionProperty = persistentEntity.getVersionProperty();
-			propertyAccessor.setProperty(versionProperty, indexedObjectInformation.getVersion());
+			if (indexedObjectInformation.getVersion() != null && persistentEntity.hasVersionProperty()) {
+				ElasticsearchPersistentProperty versionProperty = persistentEntity.getVersionProperty();
+				propertyAccessor.setProperty(versionProperty, indexedObjectInformation.getVersion());
+			}
 		}
 
 		return entity;
 	}
 
-	private ElasticsearchPersistentEntity<?> getRequiredPersistentEntity(Class<?> clazz) {
-		return converter.getMappingContext().getRequiredPersistentEntity(clazz);
-	}
-
 	@Override
 	public <T> Flux<T> multiGet(Query query, Class<T> clazz) {
 		return multiGet(query, clazz, getIndexCoordinatesFor(clazz));

src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java

@@ -107,6 +107,7 @@
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -1730,21 +1731,35 @@ private ElasticsearchPersistentEntity<?> getPersistentEntity(@Nullable Class<?>
 	@Nullable
 	private String getPersistentEntityId(Object entity) {
 
-		Object identifier = elasticsearchConverter.getMappingContext() //
-				.getRequiredPersistentEntity(entity.getClass()) //
-				.getIdentifierAccessor(entity).getIdentifier();
+		MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext = elasticsearchConverter
+				.getMappingContext();
 
-		if (identifier != null) {
-			return identifier.toString();
+		ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entity.getClass());
+
+		if (persistentEntity != null) {
+			Object identifier = persistentEntity //
+					.getIdentifierAccessor(entity).getIdentifier();
+
+			if (identifier != null) {
+				return identifier.toString();
+			}
 		}
 
 		return null;
 	}
 
 	private VersionType retrieveVersionTypeFromPersistentEntity(Class<?> clazz) {
 
-		VersionType versionType = elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz)
-				.getVersionType();
+		MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext = elasticsearchConverter
+				.getMappingContext();
+
+		ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(clazz);
+
+		VersionType versionType = null;
+
+		if (persistentEntity != null) {
+			versionType = persistentEntity.getVersionType();
+		}
 
 		return versionType != null ? versionType : VersionType.EXTERNAL;
 	}

src/main/java/org/springframework/data/elasticsearch/core/completion/Completion.java

@@ -20,11 +20,11 @@ public class Completion {
 	@Nullable private Map<String, List<String>> contexts;
 	@Nullable private Integer weight;
 
+	@PersistenceConstructor
 	public Completion(String[] input) {
 		this.input = input;
 	}
 
-	@PersistenceConstructor
 	public Completion(List<String> input) {
 		this.input = input.toArray(new String[0]);
 	}

src/main/java/org/springframework/data/elasticsearch/core/convert/DefaultElasticsearchTypeMapper.java

@@ -26,6 +26,8 @@
 import org.springframework.data.mapping.Alias;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 
 /**
@@ -38,6 +40,9 @@
 public class DefaultElasticsearchTypeMapper extends DefaultTypeMapper<Map<String, Object>>
 		implements ElasticsearchTypeMapper {
 
+	@SuppressWarnings("rawtypes") //
+	private static final TypeInformation<Map> MAP_TYPE_INFO = ClassTypeInformation.from(Map.class);
+
 	private final @Nullable String typeKey;
 
 	public DefaultElasticsearchTypeMapper(@Nullable String typeKey) {
@@ -62,11 +67,23 @@ public DefaultElasticsearchTypeMapper(@Nullable String typeKey, TypeAliasAccesso
 		this.typeKey = typeKey;
 	}
 
-	@Override
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#isTypeKey(java.lang.String)
+	 */
 	public boolean isTypeKey(String key) {
 		return typeKey != null && typeKey.equals(key);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object)
+	 */
+	@Override
+	protected TypeInformation<?> getFallbackTypeFor(Map<String, Object> source) {
+		return MAP_TYPE_INFO;
+	}
+
 	/**
 	 * {@link TypeAliasAccessor} to store aliases in a {@link Map}.
 	 *