DATAES-631 - refactoring.

Author: sothawo

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

@@ -3,10 +3,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.elasticsearch.ElasticsearchException;
+import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.index.MappingBuilder;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -69,4 +71,11 @@ protected String buildMapping(Class<?> clazz) {
 	public ElasticsearchConverter getElasticsearchConverter() {
 		return elasticsearchConverter;
 	}
+
+	@Override
+	public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
+		Assert.isTrue(clazz.isAnnotationPresent(Document.class), "Unable to identify index name. " + clazz.getSimpleName()
+				+ " is not a Document. Make sure the document class is annotated with @Document(indexName=\"foo\")");
+		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz);
+	}
 }

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

@@ -27,7 +27,6 @@
 import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.util.CloseableIterator;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 
 /**
  * ElasticsearchOperations
@@ -182,7 +181,7 @@ public interface ElasticsearchOperations {
 	 * @param clazz
 	 * @return the first matching object
 	 */
-	default <T> T queryForObject(CriteriaQuery query, Class<T> clazz){
+	default <T> T queryForObject(CriteriaQuery query, Class<T> clazz) {
 		List<T> content = queryForPage(query, clazz).getContent();
 		return content.isEmpty() ? null : content.get(0);
 	}
@@ -416,10 +415,10 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
 	void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index);
 
 	/**
-	 * Delete the one object with provided id
+	 * Delete the one object with provided id.
 	 *
-	 * @param id
-	 * @param index
+	 * @param id the document ot delete
+	 * @param index the index from which to delete
 	 * @return documentId of the document deleted
 	 */
 	String delete(String id, IndexCoordinates index);
@@ -570,6 +569,11 @@ default <T> void refresh(Class<T> clazz) {
 	 */
 	RequestFactory getRequestFactory();
 
+	/**
+	 * @param clazz
+	 * @return the IndexCoordinates defined on the entity.
+	 * @since 4.0
+	 */
 	default IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
 		ElasticsearchPersistentEntity entity = getPersistentEntityFor(clazz);
 		return IndexCoordinates.of(entity.getIndexName(), entity.getIndexType());

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

@@ -1281,13 +1281,6 @@ private ElasticsearchPersistentEntity<?> getPersistentEntity(@Nullable Class<?>
 		return clazz != null ? elasticsearchConverter.getMappingContext().getPersistentEntity(clazz) : null;
 	}
 
-	@Override
-	public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
-		Assert.isTrue(clazz.isAnnotationPresent(Document.class), "Unable to identify index name. " + clazz.getSimpleName()
-				+ " is not a Document. Make sure the document class is annotated with @Document(indexName=\"foo\")");
-		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz);
-	}
-
 	private String getPersistentEntityId(Object entity) {
 
 		ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntityFor(entity.getClass());

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

@@ -1012,13 +1012,6 @@ private ElasticsearchPersistentEntity<?> getPersistentEntity(@Nullable Class<?>
 		return clazz != null ? elasticsearchConverter.getMappingContext().getPersistentEntity(clazz) : null;
 	}
 
-	@Override
-	public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
-		Assert.isTrue(clazz.isAnnotationPresent(Document.class), "Unable to identify index name. " + clazz.getSimpleName()
-				+ " is not a Document. Make sure the document class is annotated with @Document(indexName=\"foo\")");
-		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz);
-	}
-
 	private String getPersistentEntityId(Object entity) {
 
 		ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntityFor(entity.getClass());