DATAES-721 - Deprecation and Warnings cleanup.

Original PR: #367

src/main/asciidoc/reference/reactive-elasticsearch-operations.adoc

@@ -82,7 +82,7 @@ Consider the following:
 ====
 [source,java]
 ----
-@Document(indexName = "marvel", type = "characters")
+@Document(indexName = "marvel")
 public class Person {
 
   private @Id String id;

src/main/java/org/springframework/data/elasticsearch/annotations/IndexPrefixes.java

@@ -20,8 +20,8 @@ package org.springframework.data.elasticsearch.annotations;
  * @since 4.0
  */
 public @interface IndexPrefixes {
-	static final int MIN_DEFAULT = 2;
+	int MIN_DEFAULT = 2;
-	static final int MAX_DEFAULT = 2;
+	int MAX_DEFAULT = 2;
 
 	int minChars() default MIN_DEFAULT;
 

src/main/java/org/springframework/data/elasticsearch/client/ClusterNodes.java

@@ -66,7 +66,7 @@ class ClusterNodes implements Streamable<TransportAddress> {
 			Assert.hasText(host, () -> String.format("No host name given cluster node %s!", node));
 			Assert.hasText(port, () -> String.format("No port given in cluster node %s!", node));
 
-			return new TransportAddress(toInetAddress(host), Integer.valueOf(port));
+			return new TransportAddress(toInetAddress(host), Integer.parseInt(port));
 
 		}).collect(Collectors.toList());
 	}

src/main/java/org/springframework/data/elasticsearch/client/ElasticsearchHost.java

@@ -104,7 +104,7 @@ public class ElasticsearchHost {
 
 	@Override
 	public String toString() {
-		return "ElasticsearchHost(" + endpoint + ", " + state.name() + ")";
+		return "ElasticsearchHost(" + endpoint + ", " + state.name() + ')';
 	}
 
 	public enum State {

src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

@@ -81,7 +81,7 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 	}
 
 	@Override
-	public NodeClient getObject() throws Exception {
+	public NodeClient getObject() {
 		return nodeClient;
 	}
 
@@ -148,7 +148,7 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 	}
 
 	@Override
-	public void destroy() throws Exception {
+	public void destroy() {
 		try {
 			// NodeClient.close() is a noop, no need to call it here
 			nodeClient = null;

src/main/java/org/springframework/data/elasticsearch/client/RestClientFactoryBean.java

@@ -41,7 +41,7 @@ public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>,
 	static final String COMMA = ",";
 
 	@Override
-	public void destroy() throws Exception {
+	public void destroy() {
 		try {
 			log.info("Closing elasticSearch  client");
 			if (client != null) {
@@ -58,7 +58,7 @@ public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>,
 	}
 
 	@Override
-	public RestHighLevelClient getObject() throws Exception {
+	public RestHighLevelClient getObject() {
 		return client;
 	}
 
@@ -75,7 +75,7 @@ public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>,
 	protected void buildClient() throws Exception {
 
 		Assert.hasText(hosts, "[Assertion Failed] At least one host must be set.");
-		ArrayList<HttpHost> httpHosts = new ArrayList<HttpHost>();
+		ArrayList<HttpHost> httpHosts = new ArrayList<>();
 		for (String host : hosts.split(COMMA)) {
 			URL hostUrl = new URL(host);
 			httpHosts.add(new HttpHost(hostUrl.getHost(), hostUrl.getPort(), hostUrl.getProtocol()));

src/main/java/org/springframework/data/elasticsearch/client/TransportClientFactoryBean.java

@@ -52,7 +52,7 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	private Properties properties;
 
 	@Override
-	public void destroy() throws Exception {
+	public void destroy() {
 		try {
 			logger.info("Closing elasticSearch  client");
 			if (client != null) {
@@ -64,7 +64,7 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}
 
 	@Override
-	public TransportClient getObject() throws Exception {
+	public TransportClient getObject() {
 		return client;
 	}
 
@@ -83,7 +83,7 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 		buildClient();
 	}
 
-	protected void buildClient() throws Exception {
+	protected void buildClient() {
 
 		client = new PreBuiltTransportClient(settings());
 

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java

@@ -440,6 +440,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.index.reindex.DeleteByQueryRequest)
 	 */
+	@Override
 	public Mono<BulkByScrollResponse> deleteBy(HttpHeaders headers, DeleteByQueryRequest deleteRequest) {
 
 		return sendRequest(deleteRequest, RequestCreator.deleteByQuery(), BulkByScrollResponse.class, headers) //
@@ -764,14 +765,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 
 		static Function<DeleteByQueryRequest, Request> deleteByQuery() {
 
-			return request -> {
+			return request -> RequestConverters.deleteByQuery(request);
-
-				try {
-					return RequestConverters.deleteByQuery(request);
-				} catch (IOException e) {
-					throw new ElasticsearchException("Could not parse request", e);
-				}
-			};
 		}
 
 		static Function<BulkRequest, Request> bulk() {

src/main/java/org/springframework/data/elasticsearch/client/reactive/MultiNodeHostProvider.java

@@ -60,6 +60,7 @@ class MultiNodeHostProvider implements HostProvider {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.reactive.HostProvider#clusterInfo()
 	 */
+	@Override
 	public Mono<ClusterInformation> clusterInfo() {
 		return nodes(null).map(this::updateNodeState).buffer(hosts.size())
 				.then(Mono.just(new ClusterInformation(new LinkedHashSet<>(this.hosts.values()))));

src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java

@@ -16,11 +16,8 @@
 package org.springframework.data.elasticsearch.client.reactive;
 
 import org.elasticsearch.common.io.stream.StreamOutput;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.elasticsearch.action.ActionResponse;
 

src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java

@@ -103,6 +103,7 @@ import org.springframework.lang.Nullable;
  * @author Peter-Josef Meisch
  * @since 3.2
  */
+@SuppressWarnings("JavadocReference")
 public class RequestConverters {
 
 	private static final XContentType REQUEST_BODY_CONTENT_TYPE = XContentType.JSON;
@@ -364,7 +365,7 @@ public class RequestConverters {
 			XContentType upsertContentType = updateRequest.upsertRequest().getContentType();
 			if ((xContentType != null) && (xContentType != upsertContentType)) {
 				throw new IllegalStateException("Update request cannot have different content types for doc [" + xContentType
-						+ "]" + " and upsert [" + upsertContentType + "] documents");
+						+ ']' + " and upsert [" + upsertContentType + "] documents");
 			} else {
 				xContentType = upsertContentType;
 			}
@@ -460,7 +461,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request explain(ExplainRequest explainRequest) throws IOException {
+	public static Request explain(ExplainRequest explainRequest) {
 		Request request = new Request(HttpMethod.GET.name(),
 				endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), "_explain"));
 
@@ -482,7 +483,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request rankEval(RankEvalRequest rankEvalRequest) throws IOException {
+	public static Request rankEval(RankEvalRequest rankEvalRequest) {
 		Request request = new Request(HttpMethod.GET.name(),
 				endpoint(rankEvalRequest.indices(), Strings.EMPTY_ARRAY, "_rank_eval"));
 
@@ -501,8 +502,7 @@ public class RequestConverters {
 		return prepareReindexRequest(reindexRequest, false);
 	}
 
-	private static Request prepareReindexRequest(ReindexRequest reindexRequest, boolean waitForCompletion)
+	private static Request prepareReindexRequest(ReindexRequest reindexRequest, boolean waitForCompletion) {
-			throws IOException {
 		String endpoint = new EndpointBuilder().addPathPart("_reindex").build();
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
 		Params params = new Params(request).withWaitForCompletion(waitForCompletion).withRefresh(reindexRequest.isRefresh())
@@ -516,7 +516,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws IOException {
+	public static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) {
 		String endpoint = endpoint(updateByQueryRequest.indices(), updateByQueryRequest.getDocTypes(), "_update_by_query");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
 		Params params = new Params(request).withRouting(updateByQueryRequest.getRouting())
@@ -541,7 +541,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request deleteByQuery(DeleteByQueryRequest deleteByQueryRequest) throws IOException {
+	public static Request deleteByQuery(DeleteByQueryRequest deleteByQueryRequest) {
 		String endpoint = endpoint(deleteByQueryRequest.indices(), deleteByQueryRequest.getDocTypes(), "_delete_by_query");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
 		Params params = new Params(request).withRouting(deleteByQueryRequest.getRouting())
@@ -587,7 +587,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request putScript(PutStoredScriptRequest putStoredScriptRequest) throws IOException {
+	public static Request putScript(PutStoredScriptRequest putStoredScriptRequest) {
 		String endpoint = new EndpointBuilder().addPathPartAsIs("_scripts").addPathPart(putStoredScriptRequest.id())
 				.build();
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
@@ -601,7 +601,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request analyze(AnalyzeRequest request) throws IOException {
+	public static Request analyze(AnalyzeRequest request) {
 		EndpointBuilder builder = new EndpointBuilder();
 		String index = request.index();
 		if (index != null) {
@@ -1145,7 +1145,7 @@ public class RequestConverters {
 		}
 		if (requestContentType != xContentType) {
 			throw new IllegalArgumentException("Mismatching content-type found for request with content-type ["
-					+ requestContentType + "], previous requests have content-type [" + xContentType + "]");
+					+ requestContentType + "], previous requests have content-type [" + xContentType + ']');
 		}
 		return xContentType;
 	}
@@ -1194,7 +1194,7 @@ public class RequestConverters {
 				// encode each part (e.g. index, type and id) separately before merging them into the path
 				// we prepend "/" to the path part to make this path absolute, otherwise there can be issues with
 				// paths that start with `-` or contain `:`
-				URI uri = new URI(null, null, null, -1, "/" + pathPart, null, null);
+				URI uri = new URI(null, null, null, -1, '/' + pathPart, null, null);
 				// manually encode any slash that each part may contain
 				return uri.getRawPath().substring(1).replaceAll("/", "%2F");
 			} catch (URISyntaxException e) {

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java

@@ -127,7 +127,7 @@ public class ElasticsearchConfigurationSupport {
 			return Collections.emptySet();
 		}
 
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+		Set<Class<?>> initialEntitySet = new HashSet<>();
 
 		if (StringUtils.hasText(basePackage)) {
 

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

@@ -79,6 +79,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	// endregion
 
 	// region DocumentOperations
+	@Override
 	public void delete(Query query, Class<?> clazz, IndexCoordinates index) {
 
 		Assert.notNull(query, "Query must not be null.");

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

@@ -20,10 +20,13 @@ import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 
 import org.elasticsearch.common.geo.GeoDistance;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.GeoBoundingBoxQueryBuilder;
+import org.elasticsearch.index.query.GeoDistanceQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.query.Criteria;
@@ -39,20 +42,16 @@ import org.springframework.util.Assert;
  * @author Franck Marchand
  * @author Mohsin Husen
  * @author Artur Konczak
- *
+ * @author Peter-Josef Meisch
  */
 class CriteriaFilterProcessor {
 
-
 	QueryBuilder createFilterFromCriteria(Criteria criteria) {
 		List<QueryBuilder> fbList = new LinkedList<>();
 		QueryBuilder filter = null;
 
-		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
+		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {
-
-		while (chainIterator.hasNext()) {
 			QueryBuilder fb = null;
-			Criteria chainedCriteria = chainIterator.next();
 			if (chainedCriteria.isOr()) {
 				fb = QueryBuilders.boolQuery();
 				for (QueryBuilder f : createFilterFragmentForCriteria(chainedCriteria)) {
@@ -60,7 +59,8 @@ class CriteriaFilterProcessor {
 				}
 				fbList.add(fb);
 			} else if (chainedCriteria.isNegating()) {
-				List<QueryBuilder> negationFilters = buildNegationFilter(criteria.getField().getName(), criteria.getFilterCriteriaEntries().iterator());
+				List<QueryBuilder> negationFilters = buildNegationFilter(criteria.getField().getName(),
+						criteria.getFilterCriteriaEntries().iterator());
 
 				if (!negationFilters.isEmpty()) {
 					fbList.addAll(negationFilters);
@@ -83,7 +83,6 @@ class CriteriaFilterProcessor {
 		return filter;
 	}
 
-
 	private List<QueryBuilder> createFilterFragmentForCriteria(Criteria chainedCriteria) {
 		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getFilterCriteriaEntries().iterator();
 		List<QueryBuilder> filterList = new LinkedList<>();
@@ -101,7 +100,6 @@ class CriteriaFilterProcessor {
 		return filterList;
 	}
 
-
 	private QueryBuilder processCriteriaEntry(OperationKey key, Object value, String fieldName) {
 		if (value == null) {
 			return null;
@@ -116,8 +114,10 @@ class CriteriaFilterProcessor {
 				Object[] valArray = (Object[]) value;
 				Assert.noNullElements(valArray, "Geo distance filter takes 2 not null elements array as parameter.");
 				Assert.isTrue(valArray.length == 2, "Geo distance filter takes a 2-elements array as parameter.");
-				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point, "First element of a geo distance filter must be a GeoPoint, a Point or a text");
+				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point,
-				Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance, "Second element of a geo distance filter must be a text or a Distance");
+						"First element of a geo distance filter must be a GeoPoint, a Point or a text");
+				Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance,
+						"Second element of a geo distance filter must be a text or a Distance");
 
 				StringBuilder dist = new StringBuilder();
 
@@ -129,15 +129,18 @@ class CriteriaFilterProcessor {
 
 				if (valArray[0] instanceof GeoPoint) {
 					GeoPoint loc = (GeoPoint) valArray[0];
-					geoDistanceQueryBuilder.point(loc.getLat(),loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					geoDistanceQueryBuilder.point(loc.getLat(), loc.getLon()).distance(dist.toString())
+							.geoDistance(GeoDistance.PLANE);
 				} else if (valArray[0] instanceof Point) {
 					GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]);
-					geoDistanceQueryBuilder.point(loc.getLat(), loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					geoDistanceQueryBuilder.point(loc.getLat(), loc.getLon()).distance(dist.toString())
+							.geoDistance(GeoDistance.PLANE);
 				} else {
 					String loc = (String) valArray[0];
 					if (loc.contains(",")) {
-						String c[] = loc.split(",");
+						String[] c = loc.split(",");
-						geoDistanceQueryBuilder.point(Double.parseDouble(c[0]), Double.parseDouble(c[1])).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+						geoDistanceQueryBuilder.point(Double.parseDouble(c[0]), Double.parseDouble(c[1])).distance(dist.toString())
+								.geoDistance(GeoDistance.PLANE);
 					} else {
 						geoDistanceQueryBuilder.geohash(loc).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
 					}
@@ -150,7 +153,8 @@ class CriteriaFilterProcessor {
 			case BBOX: {
 				filter = QueryBuilders.geoBoundingBoxQuery(fieldName);
 
-				Assert.isTrue(value instanceof Object[], "Value of a boundedBy filter should be an array of one or two values.");
+				Assert.isTrue(value instanceof Object[],
+						"Value of a boundedBy filter should be an array of one or two values.");
 				Object[] valArray = (Object[]) value;
 				Assert.noNullElements(valArray, "Geo boundedBy filter takes a not null element array as parameter.");
 
@@ -163,7 +167,8 @@ class CriteriaFilterProcessor {
 					twoParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray);
 				} else {
 					// error
-					Assert.isTrue(false, "Geo distance filter takes a 1-elements array(GeoBox) or 2-elements array(GeoPoints or Strings(format lat,lon or geohash)).");
+					Assert.isTrue(false,
+							"Geo distance filter takes a 1-elements array(GeoBox) or 2-elements array(GeoPoints or Strings(format lat,lon or geohash)).");
 				}
 				break;
 			}
@@ -172,7 +177,6 @@ class CriteriaFilterProcessor {
 		return filter;
 	}
 
-
 	/**
 	 * extract the distance string from a {@link org.springframework.data.geo.Distance} object.
 	 *
@@ -196,7 +200,8 @@ class CriteriaFilterProcessor {
 	}
 
 	private void oneParameterBBox(GeoBoundingBoxQueryBuilder filter, Object value) {
-		Assert.isTrue(value instanceof GeoBox || value instanceof Box, "single-element of boundedBy filter must be type of GeoBox or Box");
+		Assert.isTrue(value instanceof GeoBox || value instanceof Box,
+				"single-element of boundedBy filter must be type of GeoBox or Box");
 
 		GeoBox geoBBox;
 		if (value instanceof Box) {
@@ -206,7 +211,8 @@ class CriteriaFilterProcessor {
 			geoBBox = (GeoBox) value;
 		}
 
-		filter.setCorners(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon(), geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
+		filter.setCorners(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon(), geoBBox.getBottomRight().getLat(),
+				geoBBox.getBottomRight().getLon());
 	}
 
 	private static boolean isType(Object[] array, Class clazz) {
@@ -219,7 +225,8 @@ class CriteriaFilterProcessor {
 	}
 
 	private void twoParameterBBox(GeoBoundingBoxQueryBuilder filter, Object[] values) {
-		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class), " both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
+		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class),
+				" both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
 		if (values[0] instanceof GeoPoint) {
 			GeoPoint topLeft = (GeoPoint) values[0];
 			GeoPoint bottomRight = (GeoPoint) values[1];
@@ -236,7 +243,8 @@ class CriteriaFilterProcessor {
 
 		while (it.hasNext()) {
 			Criteria.CriteriaEntry criteriaEntry = it.next();
-			QueryBuilder notFilter = QueryBuilders.boolQuery().mustNot(processCriteriaEntry(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName));
+			QueryBuilder notFilter = QueryBuilders.boolQuery()
+					.mustNot(processCriteriaEntry(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName));
 			notFilterList.add(notFilter);
 		}
 

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

@@ -157,13 +157,13 @@ class CriteriaQueryProcessor {
 				query = queryStringQuery(searchText).field(fieldName).defaultOperator(AND);
 				break;
 			case CONTAINS:
-				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
+				query = queryStringQuery('*' + searchText + '*').field(fieldName).analyzeWildcard(true);
 				break;
 			case STARTS_WITH:
-				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
+				query = queryStringQuery(searchText + '*').field(fieldName).analyzeWildcard(true);
 				break;
 			case ENDS_WITH:
-				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
+				query = queryStringQuery('*' + searchText).field(fieldName).analyzeWildcard(true);
 				break;
 			case EXPRESSION:
 				query = queryStringQuery(value.toString()).field(fieldName);

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

@@ -26,9 +26,7 @@ import java.util.Map;
 
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
 import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
 import org.elasticsearch.client.Request;
@@ -36,7 +34,9 @@ import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.GetIndexRequest;
+import org.elasticsearch.client.indices.PutMappingRequest;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.core.client.support.AliasData;
@@ -121,13 +121,11 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 
 		RestClient restClient = client.getLowLevelClient();
 		try {
-			Request request = new Request("GET",
+			Request request = new Request("GET", '/' + index.getIndexName() + "/_mapping");
-					'/' + index.getIndexName() + "/_mapping/" + index.getTypeName() + "?include_type_name=true");
 			Response response = restClient.performRequest(request);
-			return convertMappingResponse(EntityUtils.toString(response.getEntity()), index.getTypeName());
+			return convertMappingResponse(EntityUtils.toString(response.getEntity()));
 		} catch (Exception e) {
-			throw new ElasticsearchException("Error while getting mapping for indexName : " + index.getIndexName()
+			throw new ElasticsearchException("Error while getting mapping for indexName : " + index.getIndexName(), e);
-					+ " type : " + index.getTypeName() + ' ', e);
 		}
 	}
 
@@ -210,14 +208,14 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 	}
 
 	// region Helper methods
-	private Map<String, Object> convertMappingResponse(String mappingResponse, String type) {
+	private Map<String, Object> convertMappingResponse(String mappingResponse) {
 		ObjectMapper mapper = new ObjectMapper();
 
 		try {
 			Map<String, Object> result = null;
 			JsonNode node = mapper.readTree(mappingResponse);
 
-			node = node.findValue("mappings").findValue(type);
+			node = node.findValue("mappings");
 			result = mapper.readValue(mapper.writeValueAsString(node), HashMap.class);
 
 			return result;
@@ -248,7 +246,7 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 					new TypeReference<Map<String, AliasData>>() {});
 
 			Iterable<Map.Entry<String, AliasData>> aliasIter = aliasData.entrySet();
-			List<AliasMetaData> aliasMetaDataList = new ArrayList<AliasMetaData>();
+			List<AliasMetaData> aliasMetaDataList = new ArrayList<>();
 
 			for (Map.Entry<String, AliasData> aliasentry : aliasIter) {
 				AliasData data = aliasentry.getValue();
@@ -261,6 +259,5 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 			throw new ElasticsearchException("Could not map alias response : " + aliasResponse, e);
 		}
 	}
-
 	// endregion
 }

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

@@ -87,15 +87,15 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 	@Override
 	public Map<String, Object> getMapping(IndexCoordinates index) {
 
-		Assert.notNull(index, "No index defined for putMapping()");
+		Assert.notNull(index, "No index defined for getMapping()");
 
 		try {
-			return client.admin().indices()
+			return client.admin().indices().getMappings( //
-					.getMappings(new GetMappingsRequest().indices(index.getIndexNames()).types(index.getTypeNames())).actionGet()
+					new GetMappingsRequest().indices(index.getIndexNames())).actionGet() //
-					.getMappings().get(index.getIndexName()).get(index.getTypeName()).getSourceAsMap();
+					.getMappings().get(index.getIndexName()).get(IndexCoordinates.TYPE) //
+					.getSourceAsMap();
 		} catch (Exception e) {
-			throw new ElasticsearchException("Error while getting mapping for indexName : " + index.getIndexName()
+			throw new ElasticsearchException("Error while getting mapping for indexName : " + index.getIndexName(), e);
-					+ " type : " + index.getTypeName() + ' ' + e.getMessage());
 		}
 	}
 

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

@@ -41,7 +41,6 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.ElasticsearchException;
-import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
 import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;

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

@@ -35,7 +35,6 @@ import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
 import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
@@ -128,8 +127,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	public <T> T get(GetQuery query, Class<T> clazz, IndexCoordinates index) {
 		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, query, index);
 		GetResponse response = getRequestBuilder.execute().actionGet();
-		T entity = elasticsearchConverter.mapDocument(DocumentAdapters.from(response), clazz);
+		return elasticsearchConverter.mapDocument(DocumentAdapters.from(response), clazz);
-		return entity;
 	}
 
 	@Override
@@ -163,7 +161,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 
 	@Override
 	public String delete(String id, IndexCoordinates index) {
-		return client.prepareDelete(index.getIndexName(), index.getTypeName(), id).execute().actionGet().getId();
+		return client.prepareDelete(index.getIndexName(), IndexCoordinates.TYPE, id).execute().actionGet().getId();
 	}
 
 	@Override

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

@@ -99,8 +99,6 @@ class EntityOperations {
 	 * @param index index name override can be {@literal null}.
 	 * @param type index type override can be {@literal null}.
 	 * @return the {@link IndexCoordinates} containing index name and index type.
-	 * @see ElasticsearchPersistentEntity#getIndexName()
-	 * @see ElasticsearchPersistentEntity#getIndexType()
 	 */
 	IndexCoordinates determineIndex(Entity<?> entity, @Nullable String index, @Nullable String type) {
 		return determineIndex(entity.getPersistentEntity(), index, type);
@@ -116,12 +114,10 @@ class EntityOperations {
 	 * @param index index name override can be {@literal null}.
 	 * @param type index type override can be {@literal null}.
 	 * @return the {@link IndexCoordinates} containing index name and index type.
-	 * @see ElasticsearchPersistentEntity#getIndexName()
-	 * @see ElasticsearchPersistentEntity#getIndexType()
 	 */
 	IndexCoordinates determineIndex(ElasticsearchPersistentEntity<?> persistentEntity, @Nullable String index,
 			@Nullable String type) {
-		return IndexCoordinates.of(indexName(persistentEntity, index)).withTypes(typeName(persistentEntity, type));
+		return persistentEntity.getIndexCoordinates();
 	}
 
 	private static String indexName(@Nullable ElasticsearchPersistentEntity<?> entity, @Nullable String index) {
@@ -134,16 +130,6 @@ class EntityOperations {
 		return index;
 	}
 
-	private static String typeName(@Nullable ElasticsearchPersistentEntity<?> entity, @Nullable String type) {
-
-		if (StringUtils.isEmpty(type)) {
-			Assert.notNull(entity, "Cannot determine index type");
-			return entity.getIndexCoordinates().getTypeName();
-		}
-
-		return type;
-	}
-
 	/**
 	 * A representation of information about an entity.
 	 *
@@ -268,6 +254,7 @@ class EntityOperations {
 		 * @return the current version or {@literal null} in case it's uninitialized or the entity doesn't expose a version
 		 *         property.
 		 */
+		@Override
 		@Nullable
 		Number getVersion();
 	}

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

@@ -182,8 +182,8 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 			Object id = entity.getId();
 
 			IndexRequest request = id != null
-					? new IndexRequest(index.getIndexName(), index.getTypeName(), converter.convertId(id))
+					? new IndexRequest(index.getIndexName()).id(converter.convertId(id))
-					: new IndexRequest(index.getIndexName(), index.getTypeName());
+					: new IndexRequest(index.getIndexName());
 
 			request.source(converter.mapObject(value).toJson(), Requests.INDEX_CONTENT_TYPE);
 
@@ -223,7 +223,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 
 		return Mono.defer(() -> {
 
-			return doFindById(new GetRequest(index.getIndexName(), index.getTypeName(), id));
+			return doFindById(new GetRequest(index.getIndexName(), id));
 		});
 	}
 
@@ -241,7 +241,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 
 	private Mono<Boolean> doExists(String id, ElasticsearchPersistentEntity<?> entity, @Nullable IndexCoordinates index) {
 
-		return Mono.defer(() -> doExists(new GetRequest(index.getIndexName(), index.getTypeName(), id)));
+		return Mono.defer(() -> doExists(new GetRequest(index.getIndexName(), id)));
 	}
 
 	/*
@@ -285,7 +285,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 
 		return Mono.defer(() -> {
 
-			return doDelete(prepareDeleteRequest(source, new DeleteRequest(index.getIndexName(), index.getTypeName(), id)));
+			return doDelete(prepareDeleteRequest(source, new DeleteRequest(index.getIndexName(), id)));
 		});
 	}
 
@@ -312,7 +312,6 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 
 		return Flux.defer(() -> {
 			DeleteByQueryRequest request = new DeleteByQueryRequest(index.getIndexNames());
-			request.types(index.getTypeNames());
 			request.setQuery(mappedQuery(query, entity));
 
 			return doDeleteBy(prepareDeleteByRequest(request));

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

@@ -21,12 +21,9 @@ import static org.springframework.util.CollectionUtils.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -42,6 +39,8 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
+import org.elasticsearch.client.indices.CreateIndexRequest;
+import org.elasticsearch.client.indices.PutMappingRequest;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentType;
@@ -176,24 +175,26 @@ class RequestFactory {
 		return bulkRequestBuilder;
 	}
 
+	@SuppressWarnings("unchecked")
 	public CreateIndexRequest createIndexRequest(String indexName, Object settings) {
 		CreateIndexRequest request = new CreateIndexRequest(indexName);
 		if (settings instanceof String) {
 			request.settings(String.valueOf(settings), Requests.INDEX_CONTENT_TYPE);
 		} else if (settings instanceof Map) {
-			request.settings((Map) settings);
+			request.settings((Map<String, ?>) settings);
 		} else if (settings instanceof XContentBuilder) {
 			request.settings((XContentBuilder) settings);
 		}
 		return request;
 	}
 
+	@SuppressWarnings("unchecked")
 	public CreateIndexRequestBuilder createIndexRequestBuilder(Client client, String indexName, Object settings) {
 		CreateIndexRequestBuilder createIndexRequestBuilder = client.admin().indices().prepareCreate(indexName);
 		if (settings instanceof String) {
 			createIndexRequestBuilder.setSettings(String.valueOf(settings), Requests.INDEX_CONTENT_TYPE);
 		} else if (settings instanceof Map) {
-			createIndexRequestBuilder.setSettings((Map) settings);
+			createIndexRequestBuilder.setSettings((Map<String, ?>) settings);
 		} else if (settings instanceof XContentBuilder) {
 			createIndexRequestBuilder.setSettings((XContentBuilder) settings);
 		}
@@ -202,7 +203,6 @@ class RequestFactory {
 
 	public DeleteByQueryRequest deleteByQueryRequest(DeleteQuery deleteQuery, IndexCoordinates index) {
 		DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(index.getIndexNames()) //
-				.setDocTypes(index.getTypeNames()) //
 				.setQuery(deleteQuery.getQuery()) //
 				.setAbortOnVersionConflict(false) //
 				.setRefresh(true);
@@ -224,8 +224,7 @@ class RequestFactory {
 				.abortOnVersionConflict(false) //
 				.refresh(true);
 
-		SearchRequestBuilder source = requestBuilder.source() //
+		SearchRequestBuilder source = requestBuilder.source();
-				.setTypes(index.getTypeNames());
 
 		if (deleteQuery.getScrollTimeInMillis() != null)
 			source.setScroll(TimeValue.timeValueMillis(deleteQuery.getScrollTimeInMillis()));
@@ -234,11 +233,11 @@ class RequestFactory {
 	}
 
 	public GetRequest getRequest(GetQuery query, IndexCoordinates index) {
-		return new GetRequest(index.getIndexName(), index.getTypeName(), query.getId());
+		return new GetRequest(index.getIndexName(), query.getId());
 	}
 
 	public GetRequestBuilder getRequestBuilder(Client client, GetQuery query, IndexCoordinates index) {
-		return client.prepareGet(index.getIndexName(), index.getTypeName(), query.getId());
+		return client.prepareGet(index.getIndexName(), null, query.getId());
 	}
 
 	public HighlightBuilder highlightBuilder(Query query) {
@@ -265,7 +264,6 @@ class RequestFactory {
 
 	public IndexRequest indexRequest(IndexQuery query, IndexCoordinates index) {
 		String indexName = index.getIndexName();
-		String type = index.getTypeName();
 
 		IndexRequest indexRequest;
 
@@ -273,17 +271,17 @@ class RequestFactory {
 			String id = StringUtils.isEmpty(query.getId()) ? getPersistentEntityId(query.getObject()) : query.getId();
 			// If we have a query id and a document id, do not ask ES to generate one.
 			if (id != null) {
-				indexRequest = new IndexRequest(indexName, type, id);
+				indexRequest = new IndexRequest(indexName).id(id);
 			} else {
-				indexRequest = new IndexRequest(indexName, type);
+				indexRequest = new IndexRequest(indexName);
 			}
 			indexRequest.source(elasticsearchConverter.mapObject(query.getObject()).toJson(), Requests.INDEX_CONTENT_TYPE);
 		} else if (query.getSource() != null) {
-			indexRequest = new IndexRequest(indexName, type, query.getId()).source(query.getSource(),
+			indexRequest = new IndexRequest(indexName).id(query.getId()).source(query.getSource(),
 					Requests.INDEX_CONTENT_TYPE);
 		} else {
 			throw new ElasticsearchException(
-					"object or source is null, failed to index the document [id: " + query.getId() + "]");
+					"object or source is null, failed to index the document [id: " + query.getId() + ']');
 		}
 		if (query.getVersion() != null) {
 			indexRequest.version(query.getVersion());
@@ -296,7 +294,7 @@ class RequestFactory {
 
 	public IndexRequestBuilder indexRequestBuilder(Client client, IndexQuery query, IndexCoordinates index) {
 		String indexName = index.getIndexName();
-		String type = index.getTypeName();
+		String type = IndexCoordinates.TYPE;
 
 		IndexRequestBuilder indexRequestBuilder;
 
@@ -315,7 +313,7 @@ class RequestFactory {
 					Requests.INDEX_CONTENT_TYPE);
 		} else {
 			throw new ElasticsearchException(
-					"object or source is null, failed to index the document [id: " + query.getId() + "]");
+					"object or source is null, failed to index the document [id: " + query.getId() + ']');
 		}
 		if (query.getVersion() != null) {
 			indexRequestBuilder.setVersion(query.getVersion());
@@ -327,8 +325,7 @@ class RequestFactory {
 	}
 
 	public MoreLikeThisQueryBuilder moreLikeThisQueryBuilder(MoreLikeThisQuery query, IndexCoordinates index) {
-		MoreLikeThisQueryBuilder.Item item = new MoreLikeThisQueryBuilder.Item(index.getIndexName(), index.getTypeName(),
+		MoreLikeThisQueryBuilder.Item item = new MoreLikeThisQueryBuilder.Item(index.getIndexName(), query.getId());
-				query.getId());
 
 		MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = QueryBuilders
 				.moreLikeThisQuery(new MoreLikeThisQueryBuilder.Item[] { item });
@@ -414,7 +411,7 @@ class RequestFactory {
 
 		UpdateRequest queryUpdateRequest = query.getUpdateRequest();
 
-		UpdateRequest updateRequest = new UpdateRequest(index.getIndexName(), index.getTypeName(), query.getId()) //
+		UpdateRequest updateRequest = new UpdateRequest(index.getIndexName(), query.getId()) //
 				.routing(queryUpdateRequest.routing()) //
 				.retryOnConflict(queryUpdateRequest.retryOnConflict()) //
 				.timeout(queryUpdateRequest.timeout()) //
@@ -455,7 +452,7 @@ class RequestFactory {
 		UpdateRequest queryUpdateRequest = query.getUpdateRequest();
 
 		UpdateRequestBuilder updateRequestBuilder = client
-				.prepareUpdate(index.getIndexName(), index.getTypeName(), query.getId()) //
+				.prepareUpdate(index.getIndexName(), IndexCoordinates.TYPE, query.getId()) //
 				.setRouting(queryUpdateRequest.routing()) //
 				.setRetryOnConflict(queryUpdateRequest.retryOnConflict()) //
 				.setTimeout(queryUpdateRequest.timeout()) //
@@ -490,77 +487,14 @@ class RequestFactory {
 	}
 
 	private SearchRequest prepareSearchRequest(Query query, @Nullable Class<?> clazz, IndexCoordinates index) {
-		return prepareSearchRequest(query, Optional.empty(), clazz, index);
-	}
-
-	public PutMappingRequest putMappingRequest(IndexCoordinates index, Object mapping) {
-		PutMappingRequest request = new PutMappingRequest(index.getIndexName()).type(index.getTypeName());
-		if (mapping instanceof String) {
-			request.source(String.valueOf(mapping), XContentType.JSON);
-		} else if (mapping instanceof Map) {
-			request.source((Map) mapping);
-		} else if (mapping instanceof XContentBuilder) {
-			request.source((XContentBuilder) mapping);
-		}
-		return request;
-	}
-
-	public PutMappingRequestBuilder putMappingRequestBuilder(Client client, IndexCoordinates index, Object mapping) {
-		PutMappingRequestBuilder requestBuilder = client.admin().indices().preparePutMapping(index.getIndexName())
-				.setType(index.getTypeName());
-		if (mapping instanceof String) {
-			requestBuilder.setSource(String.valueOf(mapping), XContentType.JSON);
-		} else if (mapping instanceof Map) {
-			requestBuilder.setSource((Map) mapping);
-		} else if (mapping instanceof XContentBuilder) {
-			requestBuilder.setSource((XContentBuilder) mapping);
-		}
-		return requestBuilder;
-	}
-
-	public MultiGetRequest multiGetRequest(Query query, IndexCoordinates index) {
-		MultiGetRequest multiGetRequest = new MultiGetRequest();
-		getMultiRequestItems(query, index).forEach(multiGetRequest::add);
-		return multiGetRequest;
-	}
-
-	public MultiGetRequestBuilder multiGetRequestBuilder(Client client, Query searchQuery, IndexCoordinates index) {
-		MultiGetRequestBuilder multiGetRequestBuilder = client.prepareMultiGet();
-		getMultiRequestItems(searchQuery, index).forEach(multiGetRequestBuilder::add);
-		return multiGetRequestBuilder;
-	}
-
-	private List<MultiGetRequest.Item> getMultiRequestItems(Query searchQuery, IndexCoordinates index) {
-		List<MultiGetRequest.Item> items = new ArrayList<>();
-		if (!isEmpty(searchQuery.getFields())) {
-			searchQuery.addSourceFilter(new FetchSourceFilter(toArray(searchQuery.getFields()), null));
-		}
-
-		for (String id : searchQuery.getIds()) {
-			MultiGetRequest.Item item = new MultiGetRequest.Item(index.getIndexName(), index.getTypeName(), id);
-
-			if (searchQuery.getRoute() != null) {
-				item = item.routing(searchQuery.getRoute());
-			}
-			items.add(item);
-		}
-		return items;
-	}
-
-	private SearchRequest prepareSearchRequest(Query query, Optional<QueryBuilder> builder, @Nullable Class<?> clazz,
-			IndexCoordinates index) {
 		Assert.notNull(index.getIndexNames(), "No index defined for Query");
 		Assert.notEmpty(index.getIndexNames(), "No index defined for Query");
-		Assert.notNull(index.getTypeNames(), "No type defined for Query");
 
 		SearchRequest request = new SearchRequest(index.getIndexNames());
 		SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
-		request.types(index.getTypeNames());
 		sourceBuilder.version(true);
 		sourceBuilder.trackScores(query.getTrackScores());
 
-		builder.ifPresent(sourceBuilder::query);
-
 		if (query.getSourceFilter() != null) {
 			SourceFilter sourceFilter = query.getSourceFilter();
 			sourceBuilder.fetchSource(sourceFilter.getIncludes(), sourceFilter.getExcludes());
@@ -612,15 +546,119 @@ class RequestFactory {
 		return request;
 	}
 
-	private SearchRequestBuilder prepareSearchRequestBuilder(Query query, Client client,
+	@SuppressWarnings("unchecked")
-			@Nullable ElasticsearchPersistentEntity<?> entity, IndexCoordinates index) {
+	public PutMappingRequest putMappingRequest(IndexCoordinates index, Object mapping) {
+		PutMappingRequest request = new PutMappingRequest(index.getIndexName());
+		if (mapping instanceof String) {
+			request.source(String.valueOf(mapping), XContentType.JSON);
+		} else if (mapping instanceof Map) {
+			request.source((Map<String, ?>) mapping);
+		} else if (mapping instanceof XContentBuilder) {
+			request.source((XContentBuilder) mapping);
+		}
+		return request;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public PutMappingRequestBuilder putMappingRequestBuilder(Client client, IndexCoordinates index, Object mapping) {
+		PutMappingRequestBuilder requestBuilder = client.admin().indices().preparePutMapping(index.getIndexName())
+				.setType(IndexCoordinates.TYPE);
+		if (mapping instanceof String) {
+			requestBuilder.setSource(String.valueOf(mapping), XContentType.JSON);
+		} else if (mapping instanceof Map) {
+			requestBuilder.setSource((Map) mapping);
+		} else if (mapping instanceof XContentBuilder) {
+			requestBuilder.setSource((XContentBuilder) mapping);
+		}
+		return requestBuilder;
+	}
+
+	public MultiGetRequest multiGetRequest(Query query, IndexCoordinates index) {
+		MultiGetRequest multiGetRequest = new MultiGetRequest();
+		getMultiRequestItems(query, index).forEach(multiGetRequest::add);
+		return multiGetRequest;
+	}
+
+	public MultiGetRequestBuilder multiGetRequestBuilder(Client client, Query searchQuery, IndexCoordinates index) {
+		MultiGetRequestBuilder multiGetRequestBuilder = client.prepareMultiGet();
+		getMultiRequestItems(searchQuery, index).forEach(multiGetRequestBuilder::add);
+		return multiGetRequestBuilder;
+	}
+
+	private List<MultiGetRequest.Item> getMultiRequestItems(Query searchQuery, IndexCoordinates index) {
+		List<MultiGetRequest.Item> items = new ArrayList<>();
+		if (!isEmpty(searchQuery.getFields())) {
+			searchQuery.addSourceFilter(new FetchSourceFilter(toArray(searchQuery.getFields()), null));
+		}
+
+		for (String id : searchQuery.getIds()) {
+			MultiGetRequest.Item item = new MultiGetRequest.Item(index.getIndexName(), id);
+
+			if (searchQuery.getRoute() != null) {
+				item = item.routing(searchQuery.getRoute());
+			}
+			items.add(item);
+		}
+		return items;
+	}
+
+	private void prepareNativeSearch(NativeSearchQuery query, SearchSourceBuilder sourceBuilder) {
+
+		if (!query.getScriptFields().isEmpty()) {
+			for (ScriptField scriptedField : query.getScriptFields()) {
+				sourceBuilder.scriptField(scriptedField.fieldName(), scriptedField.script());
+			}
+		}
+
+		if (query.getCollapseBuilder() != null) {
+			sourceBuilder.collapse(query.getCollapseBuilder());
+		}
+
+		if (!isEmpty(query.getIndicesBoost())) {
+			for (IndexBoost indexBoost : query.getIndicesBoost()) {
+				sourceBuilder.indexBoost(indexBoost.getIndexName(), indexBoost.getBoost());
+			}
+		}
+
+		if (!isEmpty(query.getAggregations())) {
+			for (AbstractAggregationBuilder<?> aggregationBuilder : query.getAggregations()) {
+				sourceBuilder.aggregation(aggregationBuilder);
+			}
+		}
+
+	}
+
+	private void prepareNativeSearch(SearchRequestBuilder searchRequestBuilder, NativeSearchQuery nativeSearchQuery) {
+		if (!isEmpty(nativeSearchQuery.getScriptFields())) {
+			for (ScriptField scriptedField : nativeSearchQuery.getScriptFields()) {
+				searchRequestBuilder.addScriptField(scriptedField.fieldName(), scriptedField.script());
+			}
+		}
+
+		if (nativeSearchQuery.getCollapseBuilder() != null) {
+			searchRequestBuilder.setCollapse(nativeSearchQuery.getCollapseBuilder());
+		}
+
+		if (!isEmpty(nativeSearchQuery.getIndicesBoost())) {
+			for (IndexBoost indexBoost : nativeSearchQuery.getIndicesBoost()) {
+				searchRequestBuilder.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost());
+			}
+		}
+
+		if (!isEmpty(nativeSearchQuery.getAggregations())) {
+			for (AbstractAggregationBuilder<?> aggregationBuilder : nativeSearchQuery.getAggregations()) {
+				searchRequestBuilder.addAggregation(aggregationBuilder);
+			}
+		}
+	}
+
+	private SearchRequestBuilder prepareSearchRequestBuilder(Query query, Client client, @Nullable Class<?> clazz,
+			IndexCoordinates index) {
 		Assert.notNull(index.getIndexNames(), "No index defined for Query");
 		Assert.notEmpty(index.getIndexNames(), "No index defined for Query");
-		Assert.notNull(index.getTypeNames(), "No type defined for Query");
 
 		SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index.getIndexNames()) //
 				.setSearchType(query.getSearchType()) //
-				.setTypes(index.getTypeNames()) //
 				.setVersion(true) //
 				.setTrackScores(query.getTrackScores());
 
@@ -654,7 +692,7 @@ class RequestFactory {
 			searchRequestBuilder.setPreference(query.getPreference());
 		}
 
-		prepareSort(query, searchRequestBuilder, entity);
+		prepareSort(query, searchRequestBuilder, getPersistentEntity(clazz));
 
 		HighlightBuilder highlightBuilder = highlightBuilder(query);
 
@@ -669,62 +707,7 @@ class RequestFactory {
 		return searchRequestBuilder;
 	}
 
-	private void prepareNativeSearch(NativeSearchQuery query, SearchSourceBuilder sourceBuilder) {
+	@SuppressWarnings("rawtypes")
-		NativeSearchQuery nativeSearchQuery = query;
-
-		if (!nativeSearchQuery.getScriptFields().isEmpty()) {
-			for (ScriptField scriptedField : nativeSearchQuery.getScriptFields()) {
-				sourceBuilder.scriptField(scriptedField.fieldName(), scriptedField.script());
-			}
-		}
-
-		if (nativeSearchQuery.getCollapseBuilder() != null) {
-			sourceBuilder.collapse(nativeSearchQuery.getCollapseBuilder());
-		}
-
-		if (!isEmpty(nativeSearchQuery.getIndicesBoost())) {
-			for (IndexBoost indexBoost : nativeSearchQuery.getIndicesBoost()) {
-				sourceBuilder.indexBoost(indexBoost.getIndexName(), indexBoost.getBoost());
-			}
-		}
-
-		if (!isEmpty(nativeSearchQuery.getAggregations())) {
-			for (AbstractAggregationBuilder aggregationBuilder : nativeSearchQuery.getAggregations()) {
-				sourceBuilder.aggregation(aggregationBuilder);
-			}
-		}
-
-	}
-
-	private void prepareNativeSearch(SearchRequestBuilder searchRequestBuilder, NativeSearchQuery nativeSearchQuery) {
-		if (!isEmpty(nativeSearchQuery.getScriptFields())) {
-			for (ScriptField scriptedField : nativeSearchQuery.getScriptFields()) {
-				searchRequestBuilder.addScriptField(scriptedField.fieldName(), scriptedField.script());
-			}
-		}
-
-		if (nativeSearchQuery.getCollapseBuilder() != null) {
-			searchRequestBuilder.setCollapse(nativeSearchQuery.getCollapseBuilder());
-		}
-
-		if (!isEmpty(nativeSearchQuery.getIndicesBoost())) {
-			for (IndexBoost indexBoost : nativeSearchQuery.getIndicesBoost()) {
-				searchRequestBuilder.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost());
-			}
-		}
-
-		if (!isEmpty(nativeSearchQuery.getAggregations())) {
-			for (AbstractAggregationBuilder aggregationBuilder : nativeSearchQuery.getAggregations()) {
-				searchRequestBuilder.addAggregation(aggregationBuilder);
-			}
-		}
-	}
-
-	private SearchRequestBuilder prepareSearchRequestBuilder(Query query, Client client, @Nullable Class<?> clazz,
-			IndexCoordinates index) {
-		return prepareSearchRequestBuilder(query, client, getPersistentEntity(clazz), index);
-	}
-
 	private void prepareSort(Query query, SearchSourceBuilder sourceBuilder,
 			@Nullable ElasticsearchPersistentEntity<?> entity) {
 
@@ -741,6 +724,7 @@ class RequestFactory {
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
 	private void prepareSort(Query query, SearchRequestBuilder searchRequestBuilder,
 			@Nullable ElasticsearchPersistentEntity<?> entity) {
 		if (query.getSort() != null) {
@@ -756,7 +740,7 @@ class RequestFactory {
 		}
 	}
 
-	private SortBuilder getSortBuilder(Sort.Order order, @Nullable ElasticsearchPersistentEntity<?> entity) {
+	private SortBuilder<?> getSortBuilder(Sort.Order order, @Nullable ElasticsearchPersistentEntity<?> entity) {
 		SortOrder sortOrder = order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC;
 
 		if (ScoreSortBuilder.NAME.equals(order.getProperty())) {
@@ -854,7 +838,7 @@ class RequestFactory {
 		return null;
 	}
 
-	private VersionType retrieveVersionTypeFromPersistentEntity(Class clazz) {
+	private VersionType retrieveVersionTypeFromPersistentEntity(Class<?> clazz) {
 
 		if (clazz != null) {
 			return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz).getVersionType();

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

@@ -60,7 +60,7 @@ public final class SearchHitSupport {
 
 		if (result instanceof AggregatedPage<?>) {
 			AggregatedPage<?> page = (AggregatedPage<?>) result;
-			List<?> list = page.getContent().stream().map(o -> unwrapSearchHits(o)).collect(Collectors.toList());
+			List<?> list = page.getContent().stream().map(SearchHitSupport::unwrapSearchHits).collect(Collectors.toList());
 			return new AggregatedPageImpl<>(list, null, page.getTotalElements(), page.getAggregations(), page.getScrollId(),
 					page.getMaxScore());
 

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

@@ -237,6 +237,7 @@ public interface SearchOperations {
 	 * @return scrolled page result
 	 * @deprecated since 4.0, use {@link #searchScrollContinue(String, long, Class)}.
 	 */
+	@SuppressWarnings("unchecked")
 	@Deprecated
 	default <T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz) {
 		return (ScrolledPage<T>) SearchHitSupport

src/main/java/org/springframework/data/elasticsearch/core/client/support/AliasData.java

@@ -16,13 +16,8 @@
 package org.springframework.data.elasticsearch.core.client.support;
 
 import lombok.Data;
-import lombok.Getter;
 
-import org.elasticsearch.cluster.metadata.AliasMetaData;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Data

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

@@ -84,6 +84,7 @@ public class DefaultElasticsearchTypeMapper extends DefaultTypeMapper<Map<String
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.TypeAliasAccessor#readAliasFrom(java.lang.Object)
 		 */
+		@Override
 		public Alias readAliasFrom(Map<String, Object> source) {
 			return Alias.ofNullable(source.get(typeKey));
 		}
@@ -92,6 +93,7 @@ public class DefaultElasticsearchTypeMapper extends DefaultTypeMapper<Map<String
 		 * (non-Javadoc)
 		 * @see org.springframework.data.convert.TypeAliasAccessor#writeTypeTo(java.lang.Object, java.lang.Object)
 		 */
+		@Override
 		public void writeTypeTo(Map<String, Object> sink, Object alias) {
 
 			if (typeKey == null) {

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

@@ -33,6 +33,7 @@ import org.springframework.util.NumberUtils;
  * Elasticsearch specific {@link CustomConversions}.
  *
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public class ElasticsearchCustomConversions extends CustomConversions {
@@ -42,9 +43,7 @@ public class ElasticsearchCustomConversions extends CustomConversions {
 
 	static {
 
-		List<Object> converters = new ArrayList<>();
+		List<Object> converters = new ArrayList<>(GeoConverters.getConvertersToRegister());
-
-		converters.addAll(GeoConverters.getConvertersToRegister());
 		converters.add(StringToUUIDConverter.INSTANCE);
 		converters.add(UUIDToStringConverter.INSTANCE);
 		converters.add(BigDecimalToDoubleConverter.INSTANCE);

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

@@ -169,9 +169,10 @@ public class MappingElasticsearchConverter
 				.map(searchDocument -> read(type, searchDocument)) //
 				.collect(Collectors.toList());
 		Aggregations aggregations = searchDocumentResponse.getAggregations();
-		return new SearchHits<T>(totalHits, maxScore, scrollId, searchHits, aggregations);
+		return new SearchHits<>(totalHits, maxScore, scrollId, searchHits, aggregations);
 	}
 
+	@Override
 	public <T> SearchHit<T> read(Class<T> type, SearchDocument searchDocument) {
 
 		Assert.notNull(type, "type must not be null");
@@ -182,7 +183,7 @@ public class MappingElasticsearchConverter
 		Object[] sortValues = searchDocument.getSortValues();
 		T content = mapDocument(searchDocument, type);
 
-		return new SearchHit<T>(id, score, sortValues, content);
+		return new SearchHit<>(id, score, sortValues, content);
 	}
 
 	@Override

src/main/java/org/springframework/data/elasticsearch/core/document/DocumentAdapters.java

@@ -372,9 +372,7 @@ public class DocumentAdapters {
 
 			Objects.requireNonNull(action);
 
-			documentFields.forEach(field -> {
+			documentFields.forEach(field -> action.accept(field.getName(), getValue(field)));
-				action.accept(field.getName(), getValue(field));
-			});
 		}
 
 		/*
@@ -719,7 +717,7 @@ public class DocumentAdapters {
 			String id = hasId() ? getId() : "?";
 			String version = hasVersion() ? Long.toString(getVersion()) : "?";
 
-			return getClass().getSimpleName() + "@" + id + "#" + version + " " + toJson();
+			return getClass().getSimpleName() + '@' + id + '#' + version + ' ' + toJson();
 		}
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/document/MapDocument.java

@@ -281,6 +281,6 @@ class MapDocument implements Document {
 		String id = hasId() ? getId() : "?";
 		String version = hasVersion() ? Long.toString(getVersion()) : "?";
 
-		return getClass().getSimpleName() + "@" + id + "#" + version + " " + toJson();
+		return getClass().getSimpleName() + '@' + id + '#' + version + ' ' + toJson();
 	}
 }

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

@@ -31,7 +31,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.annotation.Transient;
-import org.springframework.data.elasticsearch.annotations.*;
+import org.springframework.data.elasticsearch.ElasticsearchException;
+import org.springframework.data.elasticsearch.annotations.CompletionContext;
+import org.springframework.data.elasticsearch.annotations.CompletionField;
+import org.springframework.data.elasticsearch.annotations.DynamicMapping;
+import org.springframework.data.elasticsearch.annotations.DynamicTemplates;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.GeoPointField;
+import org.springframework.data.elasticsearch.annotations.InnerField;
+import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.ResourceUtil;
 import org.springframework.data.elasticsearch.core.completion.Completion;
@@ -39,6 +49,7 @@ import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverte
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
@@ -95,14 +106,15 @@ public class MappingBuilder {
 	 * builds the Elasticsearch mapping for the given clazz.
 	 *
 	 * @return JSON string
-	 * @throws IOException
+	 * @throws ElasticsearchException on errors while building the mapping
 	 */
-	public String buildPropertyMapping(Class<?> clazz) throws IOException {
+	public String buildPropertyMapping(Class<?> clazz) throws ElasticsearchException {
 
+		try {
 			ElasticsearchPersistentEntity<?> entity = elasticsearchConverter.getMappingContext()
 					.getRequiredPersistentEntity(clazz);
 
-		XContentBuilder builder = jsonBuilder().startObject().startObject(entity.getIndexCoordinates().getTypeName());
+			XContentBuilder builder = jsonBuilder().startObject();
 
 			// Dynamic templates
 			addDynamicTemplatesMapping(builder, entity);
@@ -115,11 +127,13 @@ public class MappingBuilder {
 
 			mapEntity(builder, entity, true, "", false, FieldType.Auto, null, entity.findAnnotation(DynamicMapping.class));
 
-		builder.endObject() // indexType
+			builder.endObject() // root object
-				.endObject() // root object
 					.close();
 
 			return builder.getOutputStream().toString();
+		} catch (MappingException | IOException e) {
+			throw new ElasticsearchException("could not build mapping", e);
+		}
 	}
 
 	private void mapEntity(XContentBuilder builder, @Nullable ElasticsearchPersistentEntity entity, boolean isRootObject,

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java

@@ -44,6 +44,7 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 
 	String getIndexStoreType();
 
+	@Override
 	ElasticsearchPersistentProperty getVersionProperty();
 
 	String getParentType();

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java

@@ -41,7 +41,7 @@ public interface ElasticsearchPersistentProperty extends PersistentProperty<Elas
 	 * Returns whether the current property is a <em>potential</em> score property of the owning
 	 * {@link ElasticsearchPersistentEntity}. This method is mainly used by {@link ElasticsearchPersistentEntity}
 	 * implementation to discover score property candidates on {@link ElasticsearchPersistentEntity} creation you should
-	 * rather call {@link ElasticsearchPersistentEntity#isScoreProperty(PersistentProperty)} to determine whether the
+	 * rather call {@link ElasticsearchPersistentEntity#getScoreProperty()} to determine whether the
 	 * current property is the score property of that {@link ElasticsearchPersistentEntity} under consideration.
 	 *
 	 * @return
@@ -53,7 +53,7 @@ public interface ElasticsearchPersistentProperty extends PersistentProperty<Elas
 	 * Returns whether the current property is a <em>potential</em> parent property of the owning
 	 * {@link ElasticsearchPersistentEntity}. This method is mainly used by {@link ElasticsearchPersistentEntity}
 	 * implementation to discover parent property candidates on {@link ElasticsearchPersistentEntity} creation you should
-	 * rather call {@link ElasticsearchPersistentEntity#isParentProperty()} to determine whether the current property is
+	 * rather call {@link ElasticsearchPersistentEntity#getScoreProperty()} to determine whether the current property is
 	 * the parent property of that {@link ElasticsearchPersistentEntity} under consideration.
 	 *
 	 * @return
@@ -78,6 +78,7 @@ public interface ElasticsearchPersistentProperty extends PersistentProperty<Elas
 
 		INSTANCE;
 
+		@Override
 		public String convert(ElasticsearchPersistentProperty source) {
 			return source.getFieldName();
 		}
@@ -91,6 +92,7 @@ public interface ElasticsearchPersistentProperty extends PersistentProperty<Elas
 
 		INSTANCE;
 
+		@Override
 		public String convert(ElasticsearchPersistentProperty source) {
 			return source.getName();
 		}

src/main/java/org/springframework/data/elasticsearch/core/mapping/IndexCoordinates.java

@@ -31,6 +31,8 @@ import org.springframework.util.Assert;
  */
 public class IndexCoordinates {
 
+	public static final String TYPE = "_doc";
+
 	private final String[] indexNames;
 	private final String[] typeNames;
 

src/main/java/org/springframework/data/elasticsearch/core/query/BulkOptions.java

@@ -20,12 +20,13 @@ import java.util.List;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.common.unit.TimeValue;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.lang.Nullable;
 
 /**
  * Options that may be passed to an
- * {@link org.springframework.data.elasticsearch.core.ElasticsearchOperations#bulkIndex(List, BulkOptions)} or
+ * {@link org.springframework.data.elasticsearch.core.DocumentOperations#bulkIndex(List, BulkOptions, IndexCoordinates)} or
- * {@link org.springframework.data.elasticsearch.core.ElasticsearchOperations#bulkUpdate(List, BulkOptions)} call. <br/>
+ * {@link org.springframework.data.elasticsearch.core.DocumentOperations#bulkUpdate(List, BulkOptions, IndexCoordinates)} call. <br/>
  * Use {@link BulkOptions#builder()} to obtain a builder, then set the desired properties and call
  * {@link BulkOptionsBuilder#build()} to get the BulkOptions object.
  *

src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java

@@ -515,8 +515,8 @@ public class Criteria {
 
 	private void assertNoBlankInWildcardedQuery(String searchString, boolean leadingWildcard, boolean trailingWildcard) {
 		if (searchString != null && searchString.contains(CRITERIA_VALUE_SEPERATOR)) {
-			throw new InvalidDataAccessApiUsageException("Cannot constructQuery '" + (leadingWildcard ? "*" : "") + "\""
+			throw new InvalidDataAccessApiUsageException("Cannot constructQuery '" + (leadingWildcard ? "*" : "") + '"'
-					+ searchString + "\"" + (trailingWildcard ? "*" : "") + "'. Use expression or multiple clauses instead.");
+					+ searchString + '"' + (trailingWildcard ? "*" : "") + "'. Use expression or multiple clauses instead.");
 		}
 	}
 
@@ -618,7 +618,7 @@ public class Criteria {
 		/**
 		 * @since 4.0
 		 */
-		EXISTS;
+		EXISTS
 	}
 
 	public static class CriteriaEntry {

src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java

@@ -24,6 +24,7 @@ import org.springframework.util.Assert;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Mark Paluch
+ * @author Peter-Josef Meisch
  */
 public class CriteriaQuery extends AbstractQuery {
 
@@ -45,7 +46,7 @@ public class CriteriaQuery extends AbstractQuery {
 		this.addSort(pageable.getSort());
 	}
 
-	public static final Query fromQuery(CriteriaQuery source) {
+	public static Query fromQuery(CriteriaQuery source) {
 		return fromQuery(source, new CriteriaQuery());
 	}
 

src/main/java/org/springframework/data/elasticsearch/core/query/FetchSourceFilterBuilder.java

@@ -39,7 +39,6 @@ public class FetchSourceFilterBuilder {
 		if (includes == null) includes = new String[0];
 		if (excludes == null) excludes = new String[0];
 
-		SourceFilter sourceFilter = new FetchSourceFilter(includes, excludes);
+		return new FetchSourceFilter(includes, excludes);
-		return sourceFilter;
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQuery.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.update.UpdateRequest;
 
 /**

src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java

@@ -18,7 +18,6 @@ package org.springframework.data.elasticsearch.repository;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.repository.NoRepositoryBean;
 

src/main/java/org/springframework/data/elasticsearch/repository/query/AbstractReactiveElasticsearchRepositoryQuery.java

@@ -90,7 +90,7 @@ abstract class AbstractReactiveElasticsearchRepositoryQuery implements Repositor
 		IndexCoordinates index = IndexCoordinates.of(indexName).withTypes(indexTypeName);
 
 		ReactiveElasticsearchQueryExecution execution = getExecution(parameterAccessor,
-				new ResultProcessingConverter(processor, elasticsearchOperations));
+				new ResultProcessingConverter(processor));
 
 		return execution.execute(query, processor.getReturnedType().getDomainType(), targetType, index);
 	}

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchEntityMetadata.java

@@ -19,11 +19,17 @@ import org.springframework.data.repository.core.EntityMetadata;
 
 /**
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public interface ElasticsearchEntityMetadata<T> extends EntityMetadata<T> {
 
 	String getIndexName();
 
+	/**
+	 * @return the type for the index
+	 * @deprecated since 4.0
+	 */
+	@Deprecated
 	String getIndexTypeName();
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchParameters.java

@@ -26,6 +26,7 @@ import org.springframework.data.repository.query.Parameters;
 
 /**
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public class ElasticsearchParameters extends Parameters<ElasticsearchParameters, ElasticsearchParameter> {
@@ -55,26 +56,14 @@ public class ElasticsearchParameters extends Parameters<ElasticsearchParameters,
 	 */
 	class ElasticsearchParameter extends Parameter {
 
-		private final MethodParameter parameter;
-
 		/**
 		 * Creates a new {@link ElasticsearchParameter}.
 		 *
 		 * @param parameter must not be {@literal null}.
 		 */
 		ElasticsearchParameter(MethodParameter parameter) {
-
 			super(parameter);
-			this.parameter = parameter;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.Parameter#isSpecialParameter()
-		 */
-		@Override
-		public boolean isSpecialParameter() {
-			return super.isSpecialParameter();
-		}
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java

@@ -81,13 +81,12 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
 			SearchHits<?> searchHits = elasticsearchOperations.search(query, clazz, index);
 			result = SearchHitSupport.page(searchHits, query.getPageable());
 		} else if (queryMethod.isStreamQuery()) {
-			Class<?> entityType = clazz;
 			if (accessor.getPageable().isUnpaged()) {
 				query.setPageable(PageRequest.of(0, DEFAULT_STREAM_BATCH_SIZE));
 			} else {
 				query.setPageable(accessor.getPageable());
 			}
-			result = StreamUtils.createStreamFromIterator(elasticsearchOperations.stream(query, entityType, index));
+			result = StreamUtils.createStreamFromIterator(elasticsearchOperations.stream(query, clazz, index));
 		} else if (queryMethod.isCollectionQuery()) {
 
 			if (accessor.getPageable().isUnpaged()) {

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java

@@ -67,6 +67,7 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 	 * @return the {@link ElasticsearchEntityMetadata} for the query methods {@link #getReturnedObjectType() return type}.
 	 * @since 3.2
 	 */
+	@Override
 	public ElasticsearchEntityMetadata<?> getEntityInformation() {
 
 		if (metadata == null) {

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchParametersParameterAccessor.java

@@ -44,9 +44,7 @@ class ReactiveElasticsearchParametersParameterAccessor extends ElasticsearchPara
 
 		this.subscriptions = new ArrayList<>(values.length);
 
-		for (int i = 0; i < values.length; i++) {
+		for (Object value : values) {
-
-			Object value = values[i];
 
 			if (value == null || !ReactiveWrappers.supports(value.getClass())) {
 
@@ -95,6 +93,7 @@ class ReactiveElasticsearchParametersParameterAccessor extends ElasticsearchPara
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.query.ParametersParameterAccessor#getBindableValue(int)
 	 */
+	@Override
 	public Object getBindableValue(int index) {
 		return getValue(getParameters().getBindableParameter(index).getIndex());
 	}

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchQueryExecution.java

@@ -17,7 +17,6 @@ package org.springframework.data.elasticsearch.repository.query;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
@@ -66,13 +65,10 @@ public interface ReactiveElasticsearchQueryExecution {
 	final class ResultProcessingConverter implements Converter<Object, Object> {
 
 		private final ResultProcessor processor;
-		private final ReactiveElasticsearchOperations operations;
 
-		public ResultProcessingConverter(ResultProcessor processor, ReactiveElasticsearchOperations operations) {
+		public ResultProcessingConverter(ResultProcessor processor) {
 			Assert.notNull(processor, "processor must not be null");
-			Assert.notNull(operations, "operations must not be null");
 			this.processor = processor;
-			this.operations = operations;
 		}
 
 		/*

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchQueryMethod.java

@@ -38,6 +38,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public class ReactiveElasticsearchQueryMethod extends ElasticsearchQueryMethod {
@@ -45,13 +46,10 @@ public class ReactiveElasticsearchQueryMethod extends ElasticsearchQueryMethod {
 	private static final ClassTypeInformation<Page> PAGE_TYPE = ClassTypeInformation.from(Page.class);
 	private static final ClassTypeInformation<Slice> SLICE_TYPE = ClassTypeInformation.from(Slice.class);
 
-	private final Method method;
-
 	public ReactiveElasticsearchQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
 
 		super(method, metadata, factory, mappingContext);
-		this.method = method;
 
 		if (hasParameterOfType(method, Pageable.class)) {
 

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactivePartTreeElasticsearchQuery.java

@@ -30,13 +30,12 @@ import org.springframework.data.repository.query.parser.PartTree;
 public class ReactivePartTreeElasticsearchQuery extends AbstractReactiveElasticsearchRepositoryQuery {
 
 	private final PartTree tree;
-	private final ResultProcessor processor;
 
 	public ReactivePartTreeElasticsearchQuery(ReactiveElasticsearchQueryMethod queryMethod,
 			ReactiveElasticsearchOperations elasticsearchOperations) {
 		super(queryMethod, elasticsearchOperations);
 
-		this.processor = queryMethod.getResultProcessor();
+		ResultProcessor processor = queryMethod.getResultProcessor();
 		this.tree = new PartTree(queryMethod.getName(), processor.getReturnedType().getDomainType());
 	}
 

src/main/java/org/springframework/data/elasticsearch/repository/query/SimpleElasticsearchEntityMetadata.java

@@ -16,10 +16,12 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.util.Assert;
 
 /**
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public class SimpleElasticsearchEntityMetadata<T> implements ElasticsearchEntityMetadata<T> {
@@ -43,7 +45,7 @@ public class SimpleElasticsearchEntityMetadata<T> implements ElasticsearchEntity
 
 	@Override
 	public String getIndexTypeName() {
-		return entity.getIndexCoordinates().getTypeName();
+		return IndexCoordinates.TYPE;
 	}
 
 	@Override

src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java

@@ -101,7 +101,7 @@ public abstract class AbstractElasticsearchRepository<T, ID> implements Elastics
 				putMapping();
 			}
 		} catch (ElasticsearchException exception) {
-			LOGGER.error("failed to load elasticsearch nodes : {}", exception.getDetailedMessage());
+			LOGGER.warn("Cannot create index: {}", exception.getDetailedMessage());
 		}
 	}
 

src/main/java/org/springframework/data/elasticsearch/repository/support/ReactiveElasticsearchRepositoryFactory.java

@@ -106,6 +106,7 @@ public class ReactiveElasticsearchRepositoryFactory extends ReactiveRepositoryFa
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
 	 */
+	@Override
 	public <T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 		return getEntityInformation(domainClass, null);
 	}

src/test/java/org/springframework/data/elasticsearch/JUnit5ClusterConnectionTests.java

@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.elasticsearch.junit.jupiter.ClusterConnectionInfo;
 import org.springframework.data.elasticsearch.junit.jupiter.IntegrationTest;
-import org.springframework.data.elasticsearch.junit.jupiter.SpringDataElasticsearchExtension;
 
 /**
  * Testing the setup and parameter injection of the CusterConnectionInfo.

src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java

@@ -44,6 +44,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.InnerField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.GetQuery;
@@ -66,14 +67,15 @@ import org.springframework.test.context.ContextConfiguration;
 @ContextConfiguration(classes = { ElasticsearchTemplateConfiguration.class })
 public class NestedObjectTests {
 
-	@Autowired private ElasticsearchOperations elasticsearchTemplate;
+	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() {
-
+		indexOperations = operations.getIndexOperations();
-		IndexInitializer.init(elasticsearchTemplate, Book.class);
+		IndexInitializer.init(indexOperations, Book.class);
-		IndexInitializer.init(elasticsearchTemplate, Person.class);
+		IndexInitializer.init(indexOperations, Person.class);
-		IndexInitializer.init(elasticsearchTemplate, PersonMultipleLevelNested.class);
+		IndexInitializer.init(indexOperations, PersonMultipleLevelNested.class);
 	}
 
 	@Test
@@ -124,14 +126,14 @@ public class NestedObjectTests {
 		indexQueries.add(indexQuery2);
 
 		IndexCoordinates index = IndexCoordinates.of("test-index-person").withTypes("user");
-		elasticsearchTemplate.bulkIndex(indexQueries, index);
+		operations.bulkIndex(indexQueries, index);
-		elasticsearchTemplate.refresh(Person.class);
+		indexOperations.refresh(Person.class);
 
 		QueryBuilder builder = nestedQuery("car",
 				boolQuery().must(termQuery("car.name", "saturn")).must(termQuery("car.model", "imprezza")), ScoreMode.None);
 
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
-		SearchHits<Person> persons = elasticsearchTemplate.search(searchQuery, Person.class, index);
+		SearchHits<Person> persons = operations.search(searchQuery, Person.class, index);
 
 		assertThat(persons).hasSize(1);
 	}
@@ -143,14 +145,14 @@ public class NestedObjectTests {
 		List<IndexQuery> indexQueries = createPerson();
 
 		// when
-		elasticsearchTemplate.bulkIndex(indexQueries,
+		operations.bulkIndex(indexQueries,
 				IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user"));
-		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
+		indexOperations.refresh(PersonMultipleLevelNested.class);
 
 		// then
 		GetQuery getQuery = new GetQuery();
 		getQuery.setId("1");
-		PersonMultipleLevelNested personIndexed = elasticsearchTemplate.get(getQuery, PersonMultipleLevelNested.class,
+		PersonMultipleLevelNested personIndexed = operations.get(getQuery, PersonMultipleLevelNested.class,
 				IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user"));
 		assertThat(personIndexed).isNotNull();
 	}
@@ -162,11 +164,11 @@ public class NestedObjectTests {
 		List<IndexQuery> indexQueries = createPerson();
 
 		// when
-		elasticsearchTemplate.bulkIndex(indexQueries,
+		operations.bulkIndex(indexQueries,
 				IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user"));
 
 		// then
-		Map<String, Object> mapping = elasticsearchTemplate.getMapping(PersonMultipleLevelNested.class);
+		Map<String, Object> mapping = indexOperations.getMapping(PersonMultipleLevelNested.class);
 
 		assertThat(mapping).isNotNull();
 		Map<String, Object> propertyMap = (Map<String, Object>) mapping.get("properties");
@@ -183,8 +185,8 @@ public class NestedObjectTests {
 
 		// when
 		IndexCoordinates index = IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user");
-		elasticsearchTemplate.bulkIndex(indexQueries, index);
+		operations.bulkIndex(indexQueries, index);
-		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
+		indexOperations.refresh(PersonMultipleLevelNested.class);
 
 		// then
 		BoolQueryBuilder builder = boolQuery();
@@ -193,7 +195,7 @@ public class NestedObjectTests {
 
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
 
-		SearchHits<PersonMultipleLevelNested> personIndexed = elasticsearchTemplate.search(searchQuery,
+		SearchHits<PersonMultipleLevelNested> personIndexed = operations.search(searchQuery,
 				PersonMultipleLevelNested.class, index);
 		assertThat(personIndexed).isNotNull();
 		assertThat(personIndexed.getTotalHits()).isEqualTo(1);
@@ -323,14 +325,14 @@ public class NestedObjectTests {
 		indexQueries.add(indexQuery2);
 
 		IndexCoordinates index = IndexCoordinates.of("test-index-person").withTypes("user");
-		elasticsearchTemplate.bulkIndex(indexQueries, index);
+		operations.bulkIndex(indexQueries, index);
-		elasticsearchTemplate.refresh(Person.class);
+		indexOperations.refresh(Person.class);
 
 		// when
 		QueryBuilder builder = nestedQuery("books", boolQuery().must(termQuery("books.name", "java")), ScoreMode.None);
 
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
-		SearchHits<Person> persons = elasticsearchTemplate.search(searchQuery, Person.class, index);
+		SearchHits<Person> persons = operations.search(searchQuery, Person.class, index);
 
 		// then
 		assertThat(persons).hasSize(1);
@@ -372,13 +374,13 @@ public class NestedObjectTests {
 
 		// when
 		IndexCoordinates index = IndexCoordinates.of("test-index-book-nested-objects").withTypes("book");
-		elasticsearchTemplate.bulkIndex(indexQueries, index);
+		operations.bulkIndex(indexQueries, index);
-		elasticsearchTemplate.refresh(Book.class);
+		indexOperations.refresh(Book.class);
 
 		// then
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3"), ScoreMode.None)).build();
-		SearchHits<Book> books = elasticsearchTemplate.search(searchQuery, Book.class, index);
+		SearchHits<Book> books = operations.search(searchQuery, Book.class, index);
 
 		assertThat(books.getSearchHits()).hasSize(1);
 		assertThat(books.getSearchHit(0).getContent().getId()).isEqualTo(book2.getId());
@@ -386,7 +388,7 @@ public class NestedObjectTests {
 
 	@Setter
 	@Getter
-	@Document(indexName = "test-index-book-nested-objects", type = "book", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-book-nested-objects", replicas = 0,
 			refreshInterval = "-1")
 	static class Book {
 
@@ -400,7 +402,7 @@ public class NestedObjectTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-person", type = "user", shards = 1, replicas = 0, refreshInterval = "-1")
+	@Document(indexName = "test-index-person", replicas = 0, refreshInterval = "-1")
 	static class Person {
 
 		@Id private String id;
@@ -425,7 +427,7 @@ public class NestedObjectTests {
 	 * @author Artur Konczak
 	 */
 	@Data
-	@Document(indexName = "test-index-person-multiple-level-nested", type = "user", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-person-multiple-level-nested", replicas = 0,
 			refreshInterval = "-1")
 	static class PersonMultipleLevelNested {
 

src/test/java/org/springframework/data/elasticsearch/TestUtils.java

@@ -34,7 +34,6 @@ import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClient
 import org.springframework.data.elasticsearch.support.SearchHitsUtil;
 import org.springframework.data.util.Version;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * @author Christoph Strobl
@@ -115,7 +114,6 @@ public final class TestUtils {
 	private static class DocumentLookup implements OfType {
 
 		private String id;
-		private String type;
 
 		public DocumentLookup(String id) {
 			this.id = id;
@@ -126,9 +124,6 @@ public final class TestUtils {
 		public boolean existsIn(String index) {
 
 			GetRequest request = new GetRequest(index).id(id);
-			if (StringUtils.hasText(type)) {
-				request = request.type(type);
-			}
 			try (RestHighLevelClient client = restHighLevelClient()) {
 				return client.get(request, RequestOptions.DEFAULT).isExists();
 			}
@@ -136,7 +131,6 @@ public final class TestUtils {
 
 		@Override
 		public ExistsIn ofType(String type) {
-			this.type = type;
 			return this;
 		}
 	}

src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientTests.java

@@ -18,6 +18,7 @@ package org.springframework.data.elasticsearch.client.reactive;
 import static org.assertj.core.api.Assertions.*;
 
 import lombok.SneakyThrows;
+import org.elasticsearch.client.indices.GetIndexRequest;
 import reactor.test.StepVerifier;
 
 import java.io.IOException;
@@ -31,7 +32,6 @@ import java.util.stream.IntStream;
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.Version;
-import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.get.GetRequest;
@@ -134,17 +134,14 @@ public class ReactiveElasticsearchClientTests {
 	public void infoShouldReturnClusterInformation() {
 
 		client.info().as(StepVerifier::create) //
-				.consumeNextWith(it -> {
+				.consumeNextWith(it -> assertThat(it.getVersion()).isGreaterThanOrEqualTo(Version.CURRENT)) //
-
-					assertThat(it.getVersion()).isGreaterThanOrEqualTo(Version.CURRENT);
-				}) //
 				.verifyComplete();
 	}
 
 	@Test // DATAES-519
 	public void getOnNonExistingIndexShouldThrowException() {
 
-		client.get(new GetRequest(INDEX_I, TYPE_I, "nonono")) //
+		client.get(new GetRequest(INDEX_I, "nonono")) //
 				.as(StepVerifier::create) //
 				.expectError(ElasticsearchStatusException.class) //
 				.verify();
@@ -155,7 +152,7 @@ public class ReactiveElasticsearchClientTests {
 
 		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		client.get(new GetRequest(INDEX_I, TYPE_I, id)) //
+		client.get(new GetRequest(INDEX_I, id)) //
 				.as(StepVerifier::create) //
 				.consumeNextWith(it -> {
 
@@ -171,17 +168,7 @@ public class ReactiveElasticsearchClientTests {
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
 		String id = "this-one-does-not-exist";
-		client.get(new GetRequest(INDEX_I, TYPE_I, id)) //
+		client.get(new GetRequest(INDEX_I, id)) //
-				.as(StepVerifier::create) //
-				.verifyComplete();
-	}
-
-	@Test // DATAES-488
-	public void getShouldCompleteForNonExistingType() {
-
-		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
-
-		client.get(new GetRequest(INDEX_I, "fantasy-books", id)) //
 				.as(StepVerifier::create) //
 				.verifyComplete();
 	}
@@ -193,17 +180,13 @@ public class ReactiveElasticsearchClientTests {
 		String id2 = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
 		MultiGetRequest request = new MultiGetRequest() //
-				.add(INDEX_I, TYPE_I, id1) //
+				.add(INDEX_I, id1) //
-				.add(INDEX_I, TYPE_I, id2);
+				.add(INDEX_I, id2);
 
 		client.multiGet(request) //
 				.as(StepVerifier::create) //
-				.consumeNextWith(it -> {
+				.consumeNextWith(it -> assertThat(it.getId()).isEqualTo(id1)) //
-					assertThat(it.getId()).isEqualTo(id1);
+				.consumeNextWith(it -> assertThat(it.getId()).isEqualTo(id2)) //
-				}) //
-				.consumeNextWith(it -> {
-					assertThat(it.getId()).isEqualTo(id2);
-				}) //
 				.verifyComplete();
 	}
 
@@ -214,14 +197,12 @@ public class ReactiveElasticsearchClientTests {
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
 		MultiGetRequest request = new MultiGetRequest() //
-				.add(INDEX_I, TYPE_I, id1) //
+				.add(INDEX_I, id1) //
-				.add(INDEX_I, TYPE_I, "this-one-does-not-exist");
+				.add(INDEX_I, "this-one-does-not-exist");
 
 		client.multiGet(request) //
 				.as(StepVerifier::create) //
-				.consumeNextWith(it -> {
+				.consumeNextWith(it -> assertThat(it.getId()).isEqualTo(id1)) //
-					assertThat(it.getId()).isEqualTo(id1);
-				}) //
 				.verifyComplete();
 	}
 
@@ -232,9 +213,9 @@ public class ReactiveElasticsearchClientTests {
 		String id2 = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
 		MultiGetRequest request = new MultiGetRequest() //
-				.add(INDEX_I, TYPE_I, id1) //
+				.add(INDEX_I,id1) //
-				.add(INDEX_I, TYPE_I, "this-one-does-not-exist") //
+				.add(INDEX_I,"this-one-does-not-exist") //
-				.add(INDEX_I, TYPE_I, id2); //
+				.add(INDEX_I,id2); //
 
 		client.multiGet(request) //
 				.map(GetResult::getId) //
@@ -249,7 +230,9 @@ public class ReactiveElasticsearchClientTests {
 		String id1 = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 		String id2 = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		client.multiGet(new MultiGetRequest().add(INDEX_II, TYPE_I, id1).add(INDEX_II, TYPE_I, id2)) //
+		client.multiGet(new MultiGetRequest() //
+				.add(INDEX_II, id1)
+				.add(INDEX_II, id2)) //
 				.as(StepVerifier::create) //
 				.verifyComplete();
 	}
@@ -261,8 +244,8 @@ public class ReactiveElasticsearchClientTests {
 		String id2 = addSourceDocument().ofType(TYPE_II).to(INDEX_II);
 
 		MultiGetRequest request = new MultiGetRequest() //
-				.add(INDEX_I, TYPE_I, id1) //
+				.add(INDEX_I, id1) //
-				.add(INDEX_II, TYPE_II, id2);
+				.add(INDEX_II, id2);
 
 		client.multiGet(request) //
 				.map(GetResult::getId) //
@@ -276,7 +259,7 @@ public class ReactiveElasticsearchClientTests {
 
 		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		client.exists(new GetRequest(INDEX_I, TYPE_I, id)) //
+		client.exists(new GetRequest(INDEX_I, id)) //
 				.as(StepVerifier::create) //
 				.expectNext(true)//
 				.verifyComplete();
@@ -287,7 +270,7 @@ public class ReactiveElasticsearchClientTests {
 
 		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		client.exists(new GetRequest(INDEX_II, TYPE_I, id)) //
+		client.exists(new GetRequest(INDEX_II, id)) //
 				.as(StepVerifier::create) //
 				.expectNext(false)//
 				.verifyComplete();
@@ -325,7 +308,7 @@ public class ReactiveElasticsearchClientTests {
 	public void updateShouldUpsertNonExistingDocumentWhenUsedWithUpsert() {
 
 		String id = UUID.randomUUID().toString();
-		UpdateRequest request = new UpdateRequest(INDEX_I, TYPE_I, id) //
+		UpdateRequest request = new UpdateRequest(INDEX_I, id) //
 				.doc(DOC_SOURCE) //
 				.docAsUpsert(true);
 
@@ -344,7 +327,7 @@ public class ReactiveElasticsearchClientTests {
 
 		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		UpdateRequest request = new UpdateRequest(INDEX_I, TYPE_I, id) //
+		UpdateRequest request = new UpdateRequest(INDEX_I, id) //
 				.doc(Collections.singletonMap("dutiful", "farseer"));
 
 		client.update(request) //
@@ -362,7 +345,7 @@ public class ReactiveElasticsearchClientTests {
 	public void updateShouldErrorNonExistingDocumentWhenNotUpserted() {
 
 		String id = UUID.randomUUID().toString();
-		UpdateRequest request = new UpdateRequest(INDEX_I, TYPE_I, id) //
+		UpdateRequest request = new UpdateRequest(INDEX_I, id) //
 				.doc(DOC_SOURCE);
 
 		client.update(request) //
@@ -375,13 +358,11 @@ public class ReactiveElasticsearchClientTests {
 
 		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		DeleteRequest request = new DeleteRequest(INDEX_I, TYPE_I, id);
+		DeleteRequest request = new DeleteRequest(INDEX_I, id);
 
 		client.delete(request) //
 				.as(StepVerifier::create) //
-				.consumeNextWith(it -> {
+				.consumeNextWith(it -> assertThat(it.status()).isEqualTo(RestStatus.OK)) //
-					assertThat(it.status()).isEqualTo(RestStatus.OK);
-				}) //
 				.verifyComplete();
 	}
 
@@ -390,13 +371,11 @@ public class ReactiveElasticsearchClientTests {
 
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		DeleteRequest request = new DeleteRequest(INDEX_I, TYPE_I, "this-one-does-not-exist");
+		DeleteRequest request = new DeleteRequest(INDEX_I, "this-one-does-not-exist");
 
 		client.delete(request) //
 				.as(StepVerifier::create) //
-				.consumeNextWith(it -> {
+				.consumeNextWith(it -> assertThat(it.status()).isEqualTo(RestStatus.NOT_FOUND)) //
-					assertThat(it.status()).isEqualTo(RestStatus.NOT_FOUND);
-				}) //
 				.verifyComplete();
 	}
 
@@ -406,7 +385,7 @@ public class ReactiveElasticsearchClientTests {
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		SearchRequest request = new SearchRequest(INDEX_I).types(TYPE_I) //
+		SearchRequest request = new SearchRequest(INDEX_I) //
 				.source(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()));
 
 		client.search(request) //
@@ -420,7 +399,7 @@ public class ReactiveElasticsearchClientTests {
 
 		syncClient.indices().create(new CreateIndexRequest(INDEX_I), RequestOptions.DEFAULT);
 
-		SearchRequest request = new SearchRequest(INDEX_I).types(TYPE_I) //
+		SearchRequest request = new SearchRequest(INDEX_I) //
 				.source(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()));
 
 		client.search(request) //
@@ -435,7 +414,6 @@ public class ReactiveElasticsearchClientTests {
 		String id = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
 		DeleteByQueryRequest request = new DeleteByQueryRequest(INDEX_I) //
-				.setDocTypes(TYPE_I) //
 				.setQuery(QueryBuilders.boolQuery().must(QueryBuilders.termQuery("_id", id)));
 
 		client.deleteBy(request) //
@@ -452,7 +430,6 @@ public class ReactiveElasticsearchClientTests {
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
 		DeleteByQueryRequest request = new DeleteByQueryRequest(INDEX_I) //
-				.setDocTypes(TYPE_I) //
 				.setQuery(QueryBuilders.boolQuery().must(QueryBuilders.termQuery("_id", "it-was-not-me")));
 
 		client.deleteBy(request) //
@@ -467,7 +444,7 @@ public class ReactiveElasticsearchClientTests {
 
 		IntStream.range(0, 100).forEach(it -> add(Collections.singletonMap(it + "-foo", "bar")).ofType(TYPE_I).to(INDEX_I));
 
-		SearchRequest request = new SearchRequest(INDEX_I).types(TYPE_I) //
+		SearchRequest request = new SearchRequest(INDEX_I) //
 				.source(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()));
 
 		request = request.scroll(TimeValue.timeValueMinutes(1));
@@ -483,7 +460,7 @@ public class ReactiveElasticsearchClientTests {
 
 		IntStream.range(0, 100).forEach(it -> add(Collections.singletonMap(it + "-foo", "bar")).ofType(TYPE_I).to(INDEX_I));
 
-		SearchRequest request = new SearchRequest(INDEX_I).types(TYPE_I) //
+		SearchRequest request = new SearchRequest(INDEX_I) //
 				.source(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()));
 
 		request = request.scroll(TimeValue.timeValueMinutes(1));
@@ -524,7 +501,7 @@ public class ReactiveElasticsearchClientTests {
 				.as(StepVerifier::create) //
 				.verifyComplete();
 
-		assertThat(syncClient.indices().exists(new GetIndexRequest().indices(INDEX_I), RequestOptions.DEFAULT)).isTrue();
+		assertThat(syncClient.indices().exists(new GetIndexRequest(INDEX_I), RequestOptions.DEFAULT)).isTrue();
 	}
 
 	@Test // DATAES-569
@@ -546,7 +523,7 @@ public class ReactiveElasticsearchClientTests {
 				.as(StepVerifier::create) //
 				.verifyComplete();
 
-		assertThat(syncClient.indices().exists(new GetIndexRequest().indices(INDEX_I), RequestOptions.DEFAULT)).isFalse();
+		assertThat(syncClient.indices().exists(new GetIndexRequest(INDEX_I), RequestOptions.DEFAULT)).isFalse();
 	}
 
 	@Test // DATAES-569
@@ -658,9 +635,9 @@ public class ReactiveElasticsearchClientTests {
 		String idFirstDoc = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 		String idSecondDoc = addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		UpdateRequest requestFirstDoc = new UpdateRequest(INDEX_I, TYPE_I, idFirstDoc) //
+		UpdateRequest requestFirstDoc = new UpdateRequest(INDEX_I, idFirstDoc) //
 				.doc(Collections.singletonMap("dutiful", "farseer"));
-		UpdateRequest requestSecondDoc = new UpdateRequest(INDEX_I, TYPE_I, idSecondDoc) //
+		UpdateRequest requestSecondDoc = new UpdateRequest(INDEX_I, idSecondDoc) //
 				.doc(Collections.singletonMap("secondDocUpdate", "secondDocUpdatePartTwo"));
 
 		BulkRequest bulkRequest = new BulkRequest();
@@ -683,13 +660,13 @@ public class ReactiveElasticsearchClientTests {
 		return add(DOC_SOURCE);
 	}
 
-	private AddToIndexOfType add(Map<String, ? extends Object> source) {
+	private AddToIndexOfType add(Map<String, ?> source) {
 		return new AddDocument(source);
 	}
 
 	private IndexRequest indexRequest(Map source, String index, String type) {
 
-		return new IndexRequest(index, type) //
+		return new IndexRequest(index) //
 				.id(UUID.randomUUID().toString()) //
 				.source(source) //
 				.setRefreshPolicy(RefreshPolicy.IMMEDIATE) //
@@ -711,10 +688,10 @@ public class ReactiveElasticsearchClientTests {
 
 	class AddDocument implements AddToIndexOfType {
 
-		Map<String, ? extends Object> source;
+		Map<String, ?> source;
 		@Nullable String type;
 
-		AddDocument(Map<String, ? extends Object> source) {
+		AddDocument(Map<String, ?> source) {
 			this.source = source;
 		}
 

src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java

@@ -16,7 +16,6 @@
 package org.springframework.data.elasticsearch.client.reactive;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.elasticsearch.client.reactive.ReactiveMockClientTestsUtils.MockWebClientProvider.Receive.*;
 

src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveMockClientTestsUtils.java

@@ -129,10 +129,12 @@ public class ReactiveMockClientTestsUtils {
 			this.activeDefaultHost = activeDefaultHost;
 		}
 
+		@Override
 		public Mono<InetSocketAddress> lookupActiveHost() {
 			return delegate.lookupActiveHost();
 		}
 
+		@Override
 		public Mono<InetSocketAddress> lookupActiveHost(Verification verification) {
 
 			if (StringUtils.hasText(activeDefaultHost)) {
@@ -142,14 +144,17 @@ public class ReactiveMockClientTestsUtils {
 			return delegate.lookupActiveHost(verification);
 		}
 
+		@Override
 		public Mono<WebClient> getActive() {
 			return delegate.getActive();
 		}
 
+		@Override
 		public Mono<WebClient> getActive(Verification verification) {
 			return delegate.getActive(verification);
 		}
 
+		@Override
 		public WebClient createWebClient(InetSocketAddress endpoint) {
 			return delegate.createWebClient(endpoint);
 		}
@@ -210,6 +215,7 @@ public class ReactiveMockClientTestsUtils {
 			return get(getInetSocketAddress(host));
 		}
 
+		@Override
 		public WebClient get(InetSocketAddress endpoint) {
 
 			synchronized (lock) {

src/test/java/org/springframework/data/elasticsearch/config/abstractelasticsearchconfiguration/ElasticsearchConfigurationTests.java

@@ -65,7 +65,7 @@ public class ElasticsearchConfigurationTests {
 		assertThat(repository).isNotNull();
 	}
 
-	@Document(indexName = "test-index-config-abstractelasticsearchconfiguraiton", type = "test-type", createIndex = false)
+	@Document(indexName = "test-index-config-abstractelasticsearchconfiguraiton", createIndex = false)
 	static class CreateIndexFalseEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/config/namespace/ElasticsearchNamespaceHandlerTests.java

@@ -63,7 +63,7 @@ public class ElasticsearchNamespaceHandlerTests {
 		assertThat(context.getBean(RestClientFactoryBean.class)).isInstanceOf(RestClientFactoryBean.class);
 	}
 
-	@Document(indexName = "test-index-config-namespace", type = "test-type", createIndex = false)
+	@Document(indexName = "test-index-config-namespace", createIndex = false)
 	static class CreateIndexFalseEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/config/nested/EnableNestedElasticsearchRepositoriesTests.java

@@ -35,7 +35,7 @@ import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.Score;
 import org.springframework.data.elasticsearch.annotations.ScriptedField;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
-import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
+import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.data.repository.Repository;
@@ -50,7 +50,7 @@ import org.springframework.test.context.ContextConfiguration;
 public class EnableNestedElasticsearchRepositoriesTests {
 
 	@Configuration
-	@Import({ ElasticsearchTemplateConfiguration.class })
+	@Import({ ElasticsearchRestTemplateConfiguration.class })
 	@EnableElasticsearchRepositories(basePackages = { "org.springframework.data.elasticsearch.config.nested" },
 			considerNestedRepositories = true)
 	static class Config {}
@@ -64,8 +64,7 @@ public class EnableNestedElasticsearchRepositoriesTests {
 
 	@Data
 	@Builder
-	@Document(indexName = "test-index-sample-config-nested", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-config-nested", replicas = 0, refreshInterval = "-1")
-			refreshInterval = "-1")
 	static class SampleEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/config/nested/EnableNestedElasticsearchRepositoriesTransportTests.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config.nested;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.test.context.ContextConfiguration;
+
+/**
+ * @author Peter-Josef Meisch
+ */
+@ContextConfiguration(classes = { EnableNestedElasticsearchRepositoriesTransportTests.Config.class })
+public class EnableNestedElasticsearchRepositoriesTransportTests {
+	@Configuration
+	@Import({ ElasticsearchTemplateConfiguration.class })
+	@EnableElasticsearchRepositories(considerNestedRepositories = true)
+	static class Config {}
+}

src/test/java/org/springframework/data/elasticsearch/config/notnested/EnableElasticsearchRepositoriesTests.java

@@ -83,7 +83,7 @@ public class EnableElasticsearchRepositoriesTests implements ApplicationContextA
 
 	@BeforeEach
 	public void before() {
-		IndexInitializer.init(operations, SampleEntity.class);
+		IndexInitializer.init(operations.getIndexOperations(), SampleEntity.class);
 	}
 
 	@Test
@@ -112,8 +112,7 @@ public class EnableElasticsearchRepositoriesTests implements ApplicationContextA
 	}
 
 	@Data
-	@Document(indexName = "test-index-sample-config-not-nested", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-config-not-nested", replicas = 0, refreshInterval = "-1")
-			refreshInterval = "-1")
 	static class SampleEntity {
 
 		@Id private String id;
@@ -129,8 +128,7 @@ public class EnableElasticsearchRepositoriesTests implements ApplicationContextA
 	}
 
 	@Data
-	@Document(indexName = "test-index-uuid-keyed-config-not-nested", type = "test-type-uuid-keyed", shards = 1,
+	@Document(indexName = "test-index-uuid-keyed-config-not-nested", replicas = 0, refreshInterval = "-1")
-			replicas = 0, refreshInterval = "-1")
 	static class SampleEntityUUIDKeyed {
 
 		@Id private UUID id;

src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java

@@ -45,7 +45,7 @@ public class DocumentAdaptersUnitTests {
 	public void shouldAdaptGetResponse() {
 
 		Map<String, DocumentField> fields = Collections.singletonMap("field",
-				new DocumentField("field", Arrays.asList("value")));
+				new DocumentField("field", Collections.singletonList("value")));
 
 		GetResult getResult = new GetResult("index", "type", "my-id", 1, 1, 42, true, null, fields, null);
 		GetResponse response = new GetResponse(getResult);
@@ -80,7 +80,7 @@ public class DocumentAdaptersUnitTests {
 	public void shouldAdaptSearchResponse() {
 
 		Map<String, DocumentField> fields = Collections.singletonMap("field",
-				new DocumentField("field", Arrays.asList("value")));
+				new DocumentField("field", Collections.singletonList("value")));
 
 		SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields);
 		searchHit.score(42);
@@ -99,7 +99,7 @@ public class DocumentAdaptersUnitTests {
 
 		Map<String, DocumentField> fields = new LinkedHashMap<>();
 
-		fields.put("string", new DocumentField("string", Arrays.asList("value")));
+		fields.put("string", new DocumentField("string", Collections.singletonList("value")));
 		fields.put("bool", new DocumentField("bool", Arrays.asList(true, true, false)));
 
 		SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields);
@@ -115,7 +115,7 @@ public class DocumentAdaptersUnitTests {
 
 		Map<String, DocumentField> fields = new LinkedHashMap<>();
 
-		fields.put("string", new DocumentField("string", Arrays.asList("value")));
+		fields.put("string", new DocumentField("string", Collections.singletonList("value")));
 		fields.put("bool", new DocumentField("bool", Arrays.asList(true, true, false)));
 		fields.put("null", new DocumentField("null", Collections.emptyList()));
 
@@ -133,7 +133,7 @@ public class DocumentAdaptersUnitTests {
 
 		Map<String, DocumentField> fields = new LinkedHashMap<>();
 
-		fields.put("string", new DocumentField("string", Arrays.asList("value")));
+		fields.put("string", new DocumentField("string", Collections.singletonList("value")));
 		fields.put("bool", new DocumentField("bool", Arrays.asList(true, true, false)));
 
 		SearchHit searchHit = new SearchHit(123, "my-id", new Text("type"), fields);

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java

@@ -60,14 +60,12 @@ public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests {
 		IndexRequest indexRequest = new IndexRequest();
 		indexRequest.source("{}", XContentType.JSON);
 		UpdateQuery updateQuery = new UpdateQueryBuilder().withId(randomNumeric(5)).withIndexRequest(indexRequest).build();
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> operations.update(updateQuery, index)).isInstanceOf(ElasticsearchStatusException.class);
-			operations.update(updateQuery, index);
-		}).isInstanceOf(ElasticsearchStatusException.class);
 	}
 
 	@Data
 	@Builder
-	@Document(indexName = "test-index-sample-core-rest-template", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-core-rest-template", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleEntity {
 

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java

@@ -332,9 +332,7 @@ public abstract class ElasticsearchTemplateTests {
 				.withPreference("_only_nodes:oops").build();
 
 		// when
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> operations.search(searchQueryWithInvalidPreference, SampleEntity.class, index)).isInstanceOf(Exception.class);
-			operations.search(searchQueryWithInvalidPreference, SampleEntity.class, index);
-		}).isInstanceOf(Exception.class);
 	}
 
 	@Test // DATAES-422 - Add support for IndicesOptions in search queries
@@ -515,7 +513,7 @@ public abstract class ElasticsearchTemplateTests {
 
 		// when
 		DeleteQuery deleteQuery = new DeleteQuery();
-		deleteQuery.setQuery(typeQuery(TYPE_NAME));
+		deleteQuery.setQuery(termQuery("message", "foo"));
 
 		operations.delete(deleteQuery, IndexCoordinates.of("test-index-*").withTypes(TYPE_NAME));
 
@@ -1390,8 +1388,8 @@ public abstract class ElasticsearchTemplateTests {
 		indexOperations.createIndex(INDEX_1_NAME);
 
 		// when
-
 		indexOperations.putMapping(IndexCoordinates.of(INDEX_1_NAME).withTypes(TYPE_NAME), entity);
+
 		// then
 		Map<String, Object> mapping = indexOperations.getMapping(IndexCoordinates.of(INDEX_1_NAME).withTypes(TYPE_NAME));
 		assertThat(mapping.get("properties")).isNotNull();
@@ -1441,7 +1439,7 @@ public abstract class ElasticsearchTemplateTests {
 	}
 
 	@Test // DATAES-227
-	public void shouldUseUpsertOnUpdate() throws IOException {
+	public void shouldUseUpsertOnUpdate() {
 
 		// given
 		Map<String, Object> doc = new HashMap<>();
@@ -1465,7 +1463,7 @@ public abstract class ElasticsearchTemplateTests {
 	}
 
 	@Test // DATAES-693
-	public void shouldReturnSourceWhenRequested() throws IOException {
+	public void shouldReturnSourceWhenRequested() {
 		// given
 		Map<String, Object> doc = new HashMap<>();
 		doc.put("id", "1");
@@ -1525,12 +1523,10 @@ public abstract class ElasticsearchTemplateTests {
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
 				.withIndicesOptions(IndicesOptions.lenientExpandOpen()).build();
 
-		List<SearchHit<SampleEntity>> entities = new ArrayList<>();
-
 		ScrolledPage<SearchHit<SampleEntity>> scroll = operations.searchScrollStart(scrollTimeInMillis, searchQuery,
 				SampleEntity.class, index);
 
-		entities.addAll(scroll.getContent());
+		List<SearchHit<SampleEntity>> entities = new ArrayList<>(scroll.getContent());
 
 		while (scroll.hasContent()) {
 			scroll = operations.searchScrollContinue(scroll.getScrollId(), scrollTimeInMillis, SampleEntity.class);
@@ -1858,9 +1854,7 @@ public abstract class ElasticsearchTemplateTests {
 		indexOperations.refresh(IndexCoordinates.of(INDEX_NAME_SAMPLE_ENTITY));
 
 		// reindex with version one below
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> operations.index(indexQueryBuilder.withVersion(entity.getVersion() - 1).build(), index)).hasMessageContaining("version").hasMessageContaining("conflict");
-			operations.index(indexQueryBuilder.withVersion(entity.getVersion() - 1).build(), index);
-		}).hasMessageContaining("version").hasMessageContaining("conflict");
 	}
 
 	@Test
@@ -2140,9 +2134,7 @@ public abstract class ElasticsearchTemplateTests {
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria());
 
 		// when
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> operations.count(criteriaQuery, (IndexCoordinates) null)).isInstanceOf(IllegalArgumentException.class);
-			operations.count(criteriaQuery, (IndexCoordinates) null);
-		}).isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test // DATAES-67
@@ -2159,9 +2151,7 @@ public abstract class ElasticsearchTemplateTests {
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
 
 		// when
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> operations.count(searchQuery, (IndexCoordinates) null)).isInstanceOf(IllegalArgumentException.class);
-			operations.count(searchQuery, (IndexCoordinates) null);
-		}).isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test // DATAES-71
@@ -2173,7 +2163,7 @@ public abstract class ElasticsearchTemplateTests {
 				+ "                \"analyzer\": {\n" + "                    \"emailAnalyzer\": {\n"
 				+ "                        \"type\": \"custom\",\n"
 				+ "                        \"tokenizer\": \"uax_url_email\"\n" + "                    }\n"
-				+ "                }\n" + "            }\n" + "        }\n" + "}";
+				+ "                }\n" + "            }\n" + "        }\n" + '}';
 
 		indexOperations.deleteIndex(INDEX_3_NAME);
 
@@ -2215,7 +2205,7 @@ public abstract class ElasticsearchTemplateTests {
 				+ "                \"analyzer\": {\n" + "                    \"emailAnalyzer\": {\n"
 				+ "                        \"type\": \"custom\",\n"
 				+ "                        \"tokenizer\": \"uax_url_email\"\n" + "                    }\n"
-				+ "                }\n" + "            }\n" + "        }\n" + "}";
+				+ "                }\n" + "            }\n" + "        }\n" + '}';
 
 		// when
 		indexOperations.deleteIndex(SampleEntity.class);
@@ -2798,7 +2788,7 @@ public abstract class ElasticsearchTemplateTests {
 		assertThat(aliases).isEmpty();
 	}
 
-	@Document(indexName = INDEX_2_NAME, replicas = 0, shards = 1)
+	@Document(indexName = INDEX_2_NAME, replicas = 0)
 	class ResultAggregator {
 
 		private String id;
@@ -2900,7 +2890,7 @@ public abstract class ElasticsearchTemplateTests {
 	@AllArgsConstructor
 	@EqualsAndHashCode(exclude = "score")
 	@Builder
-	@Document(indexName = INDEX_NAME_SAMPLE_ENTITY, type = "test-type", shards = 1, replicas = 0, refreshInterval = "-1")
+	@Document(indexName = INDEX_NAME_SAMPLE_ENTITY, replicas = 0, refreshInterval = "-1")
 	static class SampleEntity {
 
 		@Id private String id;
@@ -2923,7 +2913,7 @@ public abstract class ElasticsearchTemplateTests {
 	@Data
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-uuid-keyed-core-template", type = "test-type-uuid-keyed", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-uuid-keyed-core-template", replicas = 0,
 			refreshInterval = "-1")
 	private static class SampleEntityUUIDKeyed {
 
@@ -2945,7 +2935,7 @@ public abstract class ElasticsearchTemplateTests {
 	@Builder
 	@AllArgsConstructor
 	@NoArgsConstructor
-	@Document(indexName = "test-index-book-core-template", type = "book", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-book-core-template", replicas = 0,
 			refreshInterval = "-1")
 	static class Book {
 
@@ -2969,7 +2959,7 @@ public abstract class ElasticsearchTemplateTests {
 	@Builder
 	@AllArgsConstructor
 	@NoArgsConstructor
-	@Document(indexName = "test-index-version-core-template", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-version-core-template", replicas = 0,
 			refreshInterval = "-1", versionType = VersionType.EXTERNAL_GTE)
 	private static class GTEVersionEntity {
 
@@ -2981,7 +2971,7 @@ public abstract class ElasticsearchTemplateTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-hetro1-core-template", type = "hetro", replicas = 0, shards = 1)
+	@Document(indexName = "test-index-hetro1-core-template", replicas = 0)
 	static class HetroEntity1 {
 
 		@Id private String id;
@@ -2996,7 +2986,7 @@ public abstract class ElasticsearchTemplateTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-hetro2-core-template", type = "hetro", replicas = 0, shards = 1)
+	@Document(indexName = "test-index-hetro2-core-template", replicas = 0)
 	static class HetroEntity2 {
 
 		@Id private String id;
@@ -3011,7 +3001,7 @@ public abstract class ElasticsearchTemplateTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-server-configuration", type = "test-type", useServerConfiguration = true,
+	@Document(indexName = "test-index-server-configuration", useServerConfiguration = true,
 			shards = 10, replicas = 10, refreshInterval = "-1")
 	private static class UseServerConfigurationEntity {
 
@@ -3021,7 +3011,7 @@ public abstract class ElasticsearchTemplateTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-sample-mapping", type = "mapping", shards = 1, replicas = 0, refreshInterval = "-1")
+	@Document(indexName = "test-index-sample-mapping", replicas = 0, refreshInterval = "-1")
 	static class SampleMappingEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateTests.java

@@ -59,11 +59,10 @@ public class ElasticsearchTransportTemplateTests extends ElasticsearchTemplateTe
 		IndexRequest indexRequest = new IndexRequest();
 		indexRequest.source("{}", XContentType.JSON);
 		UpdateQuery updateQuery = new UpdateQueryBuilder().withId(randomNumeric(5)).withIndexRequest(indexRequest).build();
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> operations.update(updateQuery, index)).isInstanceOf(DocumentMissingException.class);
-			operations.update(updateQuery, index);
-		}).isInstanceOf(DocumentMissingException.class);
 	}
 
+	@Override
 	@Test // DATAES-187
 	public void shouldUsePageableOffsetToSetFromInSearchRequest() {
 
@@ -88,7 +87,7 @@ public class ElasticsearchTransportTemplateTests extends ElasticsearchTemplateTe
 	}
 
 	@Data
-	@Document(indexName = "test-index-sample-core-transport-template", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-core-transport-template", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleEntity {
 

src/test/java/org/springframework/data/elasticsearch/core/IndexCoordinatesTest.java

@@ -27,23 +27,17 @@ class IndexCoordinatesTest {
 
 	@Test
 	void cannotBeInitializedWithNullIndexName() {
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> IndexCoordinates.of(null)).isInstanceOf(IllegalArgumentException.class);
-			IndexCoordinates.of(null);
-		}).isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
 	void cannotBeInitializedWithNullIndexNames() {
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> IndexCoordinates.of((String[]) null)).isInstanceOf(IllegalArgumentException.class);
-			IndexCoordinates.of((String[]) null);
-		}).isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
 	void cannotBeInitializedWithEmptyIndexNames() {
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> IndexCoordinates.of(new String[] {})).isInstanceOf(IllegalArgumentException.class);
-			IndexCoordinates.of(new String[] {});
-		}).isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test

src/test/java/org/springframework/data/elasticsearch/core/LogEntityTests.java

@@ -27,6 +27,7 @@ import java.util.Arrays;
 import java.util.Date;
 
 import org.elasticsearch.ElasticsearchException;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,11 +62,12 @@ public class LogEntityTests {
 
 	private final IndexCoordinates index = IndexCoordinates.of("test-index-log-core").withTypes("test-log-type");
 	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() throws ParseException {
-
+		indexOperations = operations.getIndexOperations();
-		IndexInitializer.init(operations, LogEntity.class);
+		IndexInitializer.init(indexOperations, LogEntity.class);
 
 		SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 		IndexQuery indexQuery1 = new LogEntityBuilder("1").action("update").date(dateFormatter.parse("2013-10-18 18:01"))
@@ -81,7 +83,12 @@ public class LogEntityTests {
 				.code(2).ip("10.10.10.4").buildIndex();
 
 		operations.bulkIndex(Arrays.asList(indexQuery1, indexQuery2, indexQuery3, indexQuery4), index);
-		operations.refresh(LogEntity.class);
+		indexOperations.refresh(LogEntity.class);
+	}
+
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex(LogEntity.class);
 	}
 
 	@Test // DATAES-66
@@ -122,7 +129,7 @@ public class LogEntityTests {
 	 * Simple type to test facets
 	 */
 	@Data
-	@Document(indexName = "test-index-log-core", type = "test-log-type", shards = 1, replicas = 0, refreshInterval = "-1")
+	@Document(indexName = "test-index-log-core", replicas = 0, refreshInterval = "-1")
 	static class LogEntity {
 
 		private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");

src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java

@@ -24,6 +24,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -99,7 +100,7 @@ public class ReactiveElasticsearchTemplateTests {
 	}
 
 	@AfterEach
-	public void tearDown() {
+	public void after() {
 		deleteIndices();
 	}
 
@@ -110,7 +111,7 @@ public class ReactiveElasticsearchTemplateTests {
 	@Test // DATAES-504
 	public void executeShouldProvideResource() {
 
-		Mono.from(template.execute(client -> client.ping())) //
+		Mono.from(template.execute(ReactiveElasticsearchClient::ping)) //
 				.as(StepVerifier::create) //
 				.expectNext(true) //
 				.verifyComplete();
@@ -456,10 +457,7 @@ public class ReactiveElasticsearchTemplateTests {
 	@Test // DATAES-518
 	public void searchShouldApplyPagingCorrectly() {
 
-		List<SampleEntity> source = IntStream.range(0, 100).mapToObj(it -> randomEntity("entity - " + it))
+		index(IntStream.range(0, 100).mapToObj(it -> randomEntity("entity - " + it)).toArray(SampleEntity[]::new));
-				.collect(Collectors.toList());
-
-		index(source.toArray(new SampleEntity[0]));
 
 		CriteriaQuery query = new CriteriaQuery(new Criteria("message").contains("entity")) //
 				.addSort(Sort.by("message"))//
@@ -473,10 +471,7 @@ public class ReactiveElasticsearchTemplateTests {
 	@Test // DATAES-518
 	public void findWithoutPagingShouldReadAll() {
 
-		List<SampleEntity> source = IntStream.range(0, 100).mapToObj(it -> randomEntity("entity - " + it))
+		index(IntStream.range(0, 100).mapToObj(it -> randomEntity("entity - " + it)).toArray(SampleEntity[]::new));
-				.collect(Collectors.toList());
-
-		index(source.toArray(new SampleEntity[0]));
 
 		CriteriaQuery query = new CriteriaQuery(new Criteria("message").contains("entity")) //
 				.addSort(Sort.by("message"))//
@@ -717,7 +712,7 @@ public class ReactiveElasticsearchTemplateTests {
 	}
 
 	@Data
-	@Document(indexName = "marvel", type = "characters")
+	@Document(indexName = "marvel")
 	static class Person {
 
 		private @Id String id;
@@ -780,7 +775,7 @@ public class ReactiveElasticsearchTemplateTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@EqualsAndHashCode(exclude = "score")
-	@Document(indexName = DEFAULT_INDEX, type = "test-type", shards = 1, replicas = 0, refreshInterval = "-1")
+	@Document(indexName = DEFAULT_INDEX, replicas = 0, refreshInterval = "-1")
 	static class SampleEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java

@@ -258,7 +258,7 @@ public class ReactiveElasticsearchTemplateUnitTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-sample-core-reactive-template-Unit", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-core-reactive-template-Unit", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleEntity {
 

src/test/java/org/springframework/data/elasticsearch/core/aggregation/ElasticsearchTemplateAggregationTests.java

@@ -27,7 +27,6 @@ import java.lang.Integer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.junit.jupiter.api.AfterEach;
@@ -42,9 +41,9 @@ import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.InnerField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.ResultsExtractor;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
@@ -78,11 +77,12 @@ public class ElasticsearchTemplateAggregationTests {
 	static final String INDEX_NAME = "test-index-articles-core-aggregation";
 
 	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() {
-
+		indexOperations = operations.getIndexOperations();
-		IndexInitializer.init(operations, ArticleEntity.class);
+		IndexInitializer.init(indexOperations, ArticleEntity.class);
 
 		IndexQuery article1 = new ArticleEntityBuilder("1").title("article four").subject("computing")
 				.addAuthor(RIZWAN_IDREES).addAuthor(ARTUR_KONCZAK).addAuthor(MOHSIN_HUSEN).addAuthor(JONATHAN_YAN).score(10)
@@ -107,8 +107,7 @@ public class ElasticsearchTemplateAggregationTests {
 
 	@AfterEach
 	public void after() {
-
+		indexOperations.deleteIndex(ArticleEntity.class);
-		operations.deleteIndex(ArticleEntity.class);
 	}
 
 	@Test
@@ -136,7 +135,7 @@ public class ElasticsearchTemplateAggregationTests {
 	 * @author Mohsin Husen
 	 */
 	@Data
-	@Document(indexName = "test-index-articles-core-aggregation", type = "article", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-articles-core-aggregation", replicas = 0,
 			refreshInterval = "-1")
 	static class ArticleEntity {
 
@@ -154,10 +153,6 @@ public class ElasticsearchTemplateAggregationTests {
 
 		private int score;
 
-		private ArticleEntity() {
-
-		}
-
 		public ArticleEntity(String id) {
 			this.id = id;
 		}

src/test/java/org/springframework/data/elasticsearch/core/completion/ElasticsearchTemplateCompletionTests.java

@@ -26,6 +26,7 @@ import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.elasticsearch.search.suggest.SuggestBuilders;
 import org.elasticsearch.search.suggest.SuggestionBuilder;
 import org.elasticsearch.search.suggest.completion.CompletionSuggestion;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,12 @@ public class ElasticsearchTemplateCompletionTests {
 		IndexInitializer.init(indexOperations, AnnotatedCompletionEntity.class);
 	}
 
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex("test-index-annotated-completion");
+		indexOperations.deleteIndex("test-index-core-completion");
+	}
+
 	private void loadCompletionObjectEntities() {
 
 		List<IndexQuery> indexQueries = new ArrayList<>();
@@ -237,7 +244,7 @@ public class ElasticsearchTemplateCompletionTests {
 	/**
 	 * @author Mewes Kochheim
 	 */
-	@Document(indexName = "test-index-core-completion", type = "completion-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-core-completion", replicas = 0,
 			refreshInterval = "-1")
 	static class CompletionEntity {
 
@@ -321,7 +328,7 @@ public class ElasticsearchTemplateCompletionTests {
 	/**
 	 * @author Mewes Kochheim
 	 */
-	@Document(indexName = "test-index-annotated-completion", type = "annotated-completion-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-annotated-completion", replicas = 0,
 			refreshInterval = "-1")
 	static class AnnotatedCompletionEntity {
 

src/test/java/org/springframework/data/elasticsearch/core/completion/ElasticsearchTemplateCompletionWithContextsTests.java

@@ -33,6 +33,7 @@ import org.elasticsearch.search.suggest.completion.CompletionSuggestion;
 import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder;
 import org.elasticsearch.search.suggest.completion.context.CategoryQueryContext;
 import org.elasticsearch.search.suggest.completion.context.ContextMapping;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +72,11 @@ public class ElasticsearchTemplateCompletionWithContextsTests {
 	@BeforeEach
 	void setup() {
 		indexOperations = operations.getIndexOperations();
+		indexOperations.deleteIndex(ContextCompletionEntity.class);
+	}
 
+	@AfterEach
+	void after() {
 		indexOperations.deleteIndex(ContextCompletionEntity.class);
 	}
 
@@ -238,7 +243,7 @@ public class ElasticsearchTemplateCompletionWithContextsTests {
 	 * @author Mewes Kochheim
 	 * @author Robert Gruendler
 	 */
-	@Document(indexName = "test-index-context-completion", type = "context-completion-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-context-completion", replicas = 0,
 			refreshInterval = "-1")
 	static class ContextCompletionEntity {
 

src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java

@@ -56,8 +56,6 @@ import org.springframework.data.elasticsearch.annotations.GeoPointField;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
-import org.springframework.data.elasticsearch.core.query.Criteria;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Point;
@@ -201,9 +199,7 @@ public class MappingElasticsearchConverterUnitTests {
 	public void shouldFailToInitializeGivenMappingContextIsNull() {
 
 		// given
-		assertThatThrownBy(() -> {
+		assertThatThrownBy(() -> new MappingElasticsearchConverter(null)).isInstanceOf(IllegalArgumentException.class);
-			new MappingElasticsearchConverter(null);
-		}).isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
@@ -233,7 +229,7 @@ public class MappingElasticsearchConverterUnitTests {
 	}
 
 	@Test // DATAES-530
-	public void shouldMapObjectToJsonString() throws IOException {
+	public void shouldMapObjectToJsonString() {
 		// Given
 
 		// When
@@ -245,7 +241,7 @@ public class MappingElasticsearchConverterUnitTests {
 	}
 
 	@Test // DATAES-530
-	public void shouldMapJsonStringToObject() throws IOException {
+	public void shouldMapJsonStringToObject() {
 		// Given
 
 		// When
@@ -258,7 +254,7 @@ public class MappingElasticsearchConverterUnitTests {
 	}
 
 	@Test // DATAES-530
-	public void shouldMapGeoPointElasticsearchNames() throws IOException {
+	public void shouldMapGeoPointElasticsearchNames() {
 		// given
 		Point point = new Point(10, 20);
 		String pointAsString = point.getX() + "," + point.getY();
@@ -277,7 +273,7 @@ public class MappingElasticsearchConverterUnitTests {
 	}
 
 	@Test // DATAES-530
-	public void ignoresReadOnlyProperties() throws IOException {
+	public void ignoresReadOnlyProperties() {
 
 		// given
 		Sample sample = new Sample();
@@ -311,7 +307,7 @@ public class MappingElasticsearchConverterUnitTests {
 	}
 
 	@Test // DATAES-530
-	public void writesConcreteList() throws IOException {
+	public void writesConcreteList() {
 
 		Person ginger = new Person();
 		ginger.id = "ginger";
@@ -324,7 +320,7 @@ public class MappingElasticsearchConverterUnitTests {
 	}
 
 	@Test // DATAES-530
-	public void writesInterfaceList() throws IOException {
+	public void writesInterfaceList() {
 
 		Inventory gun = new Gun("Glock 19", 33);
 		Inventory grenade = new Grenade("40 mm");
@@ -346,7 +342,7 @@ public class MappingElasticsearchConverterUnitTests {
 	@Test // DATAES-530
 	public void readListOfConcreteTypesCorrectly() {
 
-		sarahAsMap.put("coWorkers", Arrays.asList(kyleAsMap));
+		sarahAsMap.put("coWorkers", Collections.singletonList(kyleAsMap));
 
 		Person target = mappingElasticsearchConverter.read(Person.class, sarahAsMap);
 
@@ -447,7 +443,7 @@ public class MappingElasticsearchConverterUnitTests {
 	public void readGenericListList() {
 
 		Document source = Document.create();
-		source.put("objectList", Arrays.asList(Arrays.asList(t800AsMap, gunAsMap)));
+		source.put("objectList", Collections.singletonList(Arrays.asList(t800AsMap, gunAsMap)));
 
 		Skynet target = mappingElasticsearchConverter.read(Skynet.class, source);
 
@@ -738,6 +734,7 @@ public class MappingElasticsearchConverterUnitTests {
 		String city;
 	}
 
+	@EqualsAndHashCode(callSuper = true)
 	@Data
 	static class Place extends Address {
 
@@ -789,7 +786,7 @@ public class MappingElasticsearchConverterUnitTests {
 	@AllArgsConstructor
 	@Builder
 	@org.springframework.data.elasticsearch.annotations.Document(indexName = "test-index-geo-core-entity-mapper",
-			type = "geo-test-index", shards = 1, replicas = 0, refreshInterval = "-1")
+			type = "geo-test-index", replicas = 0, refreshInterval = "-1")
 	static class GeoEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java

@@ -29,6 +29,7 @@ import java.util.List;
 
 import org.elasticsearch.geometry.utils.Geohash;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +90,12 @@ public class ElasticsearchTemplateGeoTests {
 		IndexInitializer.init(indexOperations, LocationMarkerEntity.class);
 	}
 
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex(AuthorMarkerEntity.class);
+		indexOperations.deleteIndex(LocationMarkerEntity.class);
+	}
+
 	private void loadClassBaseEntities() {
 
 		List<IndexQuery> indexQueries = new ArrayList<>();
@@ -368,7 +375,7 @@ public class ElasticsearchTemplateGeoTests {
 	 * @author Mohsin Husen
 	 */
 	@Data
-	@Document(indexName = "test-index-author-marker-core-geo", type = "geo-class-point-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-author-marker-core-geo", replicas = 0,
 			refreshInterval = "-1")
 	static class AuthorMarkerEntity {
 
@@ -427,7 +434,7 @@ public class ElasticsearchTemplateGeoTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-location-marker-core-geo", type = "geo-annotation-point-type", shards = 1,
+	@Document(indexName = "test-index-location-marker-core-geo",
 			replicas = 0, refreshInterval = "-1")
 	static class LocationMarkerEntity {
 

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

@@ -111,10 +111,10 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void testInfiniteLoopAvoidance() throws IOException, JSONException {
+	public void testInfiniteLoopAvoidance() throws JSONException {
 
-		String expected = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true,\""
+		String expected = "{\"properties\":{\"message\":{\"store\":true,\""
-				+ "type\":\"text\",\"index\":false," + "\"analyzer\":\"standard\"}}}}";
+				+ "type\":\"text\",\"index\":false," + "\"analyzer\":\"standard\"}}}";
 
 		String mapping = getMappingBuilder().buildPropertyMapping(SampleTransientEntity.class);
 
@@ -122,10 +122,10 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseValueFromAnnotationType() throws IOException, JSONException {
+	public void shouldUseValueFromAnnotationType() throws JSONException {
 
 		// Given
-		String expected = "{\"price\":{\"properties\":{\"price\":{\"type\":\"double\"}}}}";
+		String expected = "{\"properties\":{\"price\":{\"type\":\"double\"}}}";
 
 		// When
 		String mapping = getMappingBuilder().buildPropertyMapping(StockPrice.class);
@@ -165,9 +165,9 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldCreateMappingForSpecifiedParentType() throws IOException, JSONException {
+	public void shouldCreateMappingForSpecifiedParentType() throws JSONException {
 
-		String expected = "{\"mapping\":{\"_parent\":{\"type\":\"parentType\"},\"properties\":{}}}";
+		String expected = "{\"_parent\":{\"type\":\"parentType\"},\"properties\":{}}";
 
 		String mapping = getMappingBuilder().buildPropertyMapping(MinimalChildEntity.class);
 
@@ -175,11 +175,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-76
-	public void shouldBuildMappingWithSuperclass() throws IOException, JSONException {
+	public void shouldBuildMappingWithSuperclass() throws JSONException {
 
-		String expected = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true,\""
+		String expected = "{\"properties\":{\"message\":{\"store\":true,\""
 				+ "type\":\"text\",\"index\":false,\"analyzer\":\"standard\"}" + ",\"createdDate\":{"
-				+ "\"type\":\"date\",\"index\":false}}}}";
+				+ "\"type\":\"date\",\"index\":false}}}";
 
 		String mapping = getMappingBuilder().buildPropertyMapping(SampleInheritedEntity.class);
 
@@ -214,12 +214,12 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldBuildMappingsForGeoPoint() throws IOException, JSONException {
+	public void shouldBuildMappingsForGeoPoint() throws JSONException {
 
 		// given
-		String expected = "{\"geo-test-index\": {\"properties\": {" + "\"pointA\":{\"type\":\"geo_point\"},"
+		String expected = "{\"properties\": {" + "\"pointA\":{\"type\":\"geo_point\"},"
 				+ "\"pointB\":{\"type\":\"geo_point\"}," + "\"pointC\":{\"type\":\"geo_point\"},"
-				+ "\"pointD\":{\"type\":\"geo_point\"}" + "}}}";
+				+ "\"pointD\":{\"type\":\"geo_point\"}" + "}}";
 
 		// when
 		String mapping;
@@ -300,8 +300,8 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	public void shouldUseCopyTo() {
 
 		// given
-		operations.createIndex(CopyToEntity.class);
+		indexOperations.createIndex(CopyToEntity.class);
-		operations.putMapping(CopyToEntity.class);
+		indexOperations.putMapping(CopyToEntity.class);
 
 		// when
 		Map mapping = operations.getMapping(CopyToEntity.class);
@@ -316,11 +316,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnId() throws IOException, JSONException {
+	public void shouldUseFieldNameOnId() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true}"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true}"
-				+ "}}}";
+				+ "}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.IdEntity.class);
@@ -330,11 +330,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnText() throws IOException, JSONException {
+	public void shouldUseFieldNameOnText() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
-				+ "\"text-property\":{\"type\":\"text\"}" + "}}}";
+				+ "\"text-property\":{\"type\":\"text\"}" + "}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.TextEntity.class);
@@ -344,11 +344,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnMapping() throws IOException, JSONException {
+	public void shouldUseFieldNameOnMapping() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
-				+ "\"mapping-property\":{\"type\":\"string\",\"analyzer\":\"standard_lowercase_asciifolding\"}" + "}}}";
+				+ "\"mapping-property\":{\"type\":\"string\",\"analyzer\":\"standard_lowercase_asciifolding\"}" + "}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.MappingEntity.class);
@@ -358,11 +358,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnGeoPoint() throws IOException, JSONException {
+	public void shouldUseFieldNameOnGeoPoint() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
-				+ "\"geopoint-property\":{\"type\":\"geo_point\"}" + "}}}";
+				+ "\"geopoint-property\":{\"type\":\"geo_point\"}" + "}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.GeoPointEntity.class);
@@ -372,11 +372,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnCircularEntity() throws IOException, JSONException {
+	public void shouldUseFieldNameOnCircularEntity() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
-				+ "\"circular-property\":{\"type\":\"object\",\"properties\":{\"id-property\":{}}}" + "}}}";
+				+ "\"circular-property\":{\"type\":\"object\",\"properties\":{\"id-property\":{}}}" + "}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.CircularEntity.class);
@@ -386,12 +386,12 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnCompletion() throws IOException, JSONException {
+	public void shouldUseFieldNameOnCompletion() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
 				+ "\"completion-property\":{\"type\":\"completion\",\"max_input_length\":100,\"preserve_position_increments\":true,\"preserve_separators\":true,\"search_analyzer\":\"simple\",\"analyzer\":\"simple\"},\"completion-property\":{}"
-				+ "}}}";
+				+ "}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.CompletionEntity.class);
@@ -401,12 +401,11 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-568
-	public void shouldUseFieldNameOnMultiField() throws IOException, JSONException {
+	public void shouldUseFieldNameOnMultiField() throws JSONException {
 
 		// given
-		String expected = "{\"fieldname-type\":{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
+		String expected = "{\"properties\":{" + "\"id-property\":{\"type\":\"keyword\",\"index\":true},"
-				+ "\"multifield-property\":{\"type\":\"text\",\"analyzer\":\"whitespace\",\"fields\":{\"prefix\":{\"type\":\"text\",\"analyzer\":\"stop\",\"search_analyzer\":\"standard\"}}}"
+				+ "\"multifield-property\":{\"type\":\"text\",\"analyzer\":\"whitespace\",\"fields\":{\"prefix\":{\"type\":\"text\",\"analyzer\":\"stop\",\"search_analyzer\":\"standard\"}}}}}";
-				+ "}}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(FieldNameEntity.MultiFieldEntity.class);
@@ -416,10 +415,10 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test // DATAES-639
-	public void shouldUseIgnoreAbove() throws IOException, JSONException {
+	public void shouldUseIgnoreAbove() throws JSONException {
 
 		// given
-		String expected = "{\"ignore-above-type\":{\"properties\":{\"message\":{\"type\":\"keyword\",\"ignore_above\":10}}}}";
+		String expected = "{\"properties\":{\"message\":{\"type\":\"keyword\",\"ignore_above\":10}}}";
 
 		// when
 		String mapping = getMappingBuilder().buildPropertyMapping(IgnoreAboveEntity.class);
@@ -429,9 +428,8 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test
-	public void shouldSetFieldMappingProperties() throws JSONException, IOException {
+	public void shouldSetFieldMappingProperties() throws JSONException {
 		String expected = "{\n" + //
-				"    \"fmp\": {\n" + //
 				"        \"properties\": {\n" + //
 				"            \"storeTrue\": {\n" + //
 				"                \"store\": true\n" + //
@@ -516,7 +514,6 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 				"                \"scaling_factor\": 100.0\n" + //
 				"            }\n" + //
 				"        }\n" + //
-				"    }\n" + //
 				"}\n"; //
 
 		// when
@@ -527,10 +524,9 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	}
 
 	@Test
-	void shouldWriteDynamicMappingSettings() throws IOException, JSONException {
+	void shouldWriteDynamicMappingSettings() throws JSONException {
 
 		String expected = "{\n" + //
-				"  \"dms\": {\n" + //
 				"    \"dynamic\": \"false\",\n" + //
 				"    \"properties\": {\n" + //
 				"      \"author\": {\n" + //
@@ -539,7 +535,6 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 				"        \"properties\": {}\n" + //
 				"      }\n" + //
 				"    }\n" + //
-				"  }\n" + //
 				"}\n";
 
 		String mapping = getMappingBuilder().buildPropertyMapping(ConfigureDynamicMappingEntity.class);
@@ -555,7 +550,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "ignore-above-index", type = "ignore-above-type")
+	@Document(indexName = "ignore-above-index")
 	static class IgnoreAboveEntity {
 
 		@Id private String id;
@@ -569,12 +564,12 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@SuppressWarnings("unused")
 	static class FieldNameEntity {
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class IdEntity {
 			@Id @Field("id-property") private String id;
 		}
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class TextEntity {
 
 			@Id @Field("id-property") private String id;
@@ -583,7 +578,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 			private String textProperty;
 		}
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class MappingEntity {
 
 			@Id @Field("id-property") private String id;
@@ -592,7 +587,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 			private byte[] mappingProperty;
 		}
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class GeoPointEntity {
 
 			@Id @Field("id-property") private String id;
@@ -600,7 +595,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 			@Field("geopoint-property") private GeoPoint geoPoint;
 		}
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class CircularEntity {
 
 			@Id @Field("id-property") private String id;
@@ -609,7 +604,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 			private CircularEntity circularProperty;
 		}
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class CompletionEntity {
 
 			@Id @Field("id-property") private String id;
@@ -618,7 +613,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 			private Completion suggest;
 		}
 
-		@Document(indexName = "fieldname-index", type = "fieldname-type")
+		@Document(indexName = "fieldname-index")
 		static class MultiFieldEntity {
 
 			@Id @Field("id-property") private String id;
@@ -635,7 +630,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	 *
 	 * @author Peter-Josef Meisch
 	 */
-	@Document(indexName = "test-index-minimal", type = "mapping")
+	@Document(indexName = "test-index-minimal")
 	static class MinimalChildEntity {
 
 		@Id private String id;
@@ -653,7 +648,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-book-mapping-builder", type = "book", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-book-mapping-builder", replicas = 0,
 			refreshInterval = "-1")
 	static class Book {
 
@@ -670,7 +665,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	 * @author Stuart Stevenson
 	 * @author Mohsin Husen
 	 */
-	@Document(indexName = "test-index-simple-recursive-mapping-builder", type = "circular-object", shards = 1,
+	@Document(indexName = "test-index-simple-recursive-mapping-builder",
 			replicas = 0, refreshInterval = "-1")
 	static class SimpleRecursiveEntity {
 
@@ -686,7 +681,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-copy-to-mapping-builder", type = "test", shards = 1, replicas = 0, refreshInterval = "-1")
+	@Document(indexName = "test-copy-to-mapping-builder", replicas = 0, refreshInterval = "-1")
 	static class CopyToEntity {
 
 		@Id private String id;
@@ -706,7 +701,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-normalizer-mapping-builder", type = "test", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-normalizer-mapping-builder", replicas = 0,
 			refreshInterval = "-1")
 	@Setting(settingPath = "/settings/test-normalizer.json")
 	static class NormalizerEntity {
@@ -748,7 +743,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	/**
 	 * @author Kevin Leturc
 	 */
-	@Document(indexName = "test-index-sample-inherited-mapping-builder", type = "mapping", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-inherited-mapping-builder", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleInheritedEntity extends AbstractInheritedEntity {
 
@@ -806,7 +801,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-stock-mapping-builder", type = "price", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-stock-mapping-builder", replicas = 0,
 			refreshInterval = "-1")
 	static class StockPrice {
 
@@ -846,7 +841,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	/**
 	 * @author Jakub Vavrik
 	 */
-	@Document(indexName = "test-index-recursive-mapping-mapping-builder", type = "mapping", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-recursive-mapping-mapping-builder", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleTransientEntity {
 
@@ -882,7 +877,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 			}
 
 			public void setSomeField(SampleTransientEntity.NestedEntity someField) {
-				this.someField = someField;
+				NestedEntity.someField = someField;
 			}
 
 			public Boolean getSomething() {
@@ -903,7 +898,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-geo-mapping-builder", type = "geo-test-index", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-geo-mapping-builder", replicas = 0,
 			refreshInterval = "-1")
 	static class GeoEntity {
 
@@ -927,7 +922,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	/**
 	 * Created by akonczak on 21/08/2016.
 	 */
-	@Document(indexName = "test-index-user-mapping-builder", type = "user")
+	@Document(indexName = "test-index-user-mapping-builder")
 	static class User {
 		@Id private String id;
 
@@ -937,7 +932,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 	/**
 	 * Created by akonczak on 21/08/2016.
 	 */
-	@Document(indexName = "test-index-group-mapping-builder", type = "group")
+	@Document(indexName = "test-index-group-mapping-builder")
 	static class Group {
 
 		@Id String id;
@@ -945,7 +940,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 		@Field(type = FieldType.Nested, ignoreFields = { "groups" }) private Set<User> users = new HashSet<>();
 	}
 
-	@Document(indexName = "test-index-field-mapping-parameters", type = "fmp")
+	@Document(indexName = "test-index-field-mapping-parameters")
 	static class FieldMappingParameters {
 		@Field private String indexTrue;
 		@Field(index = false) private String indexFalse;
@@ -960,14 +955,14 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 		@Field(type = FieldType.Integer) private String type;
 		@Field(type = FieldType.Date, format = DateFormat.custom, pattern = "YYYYMMDD") private LocalDate date;
 		@Field(analyzer = "ana", searchAnalyzer = "sana", normalizer = "norma") private String analyzers;
-		@Field(type = Keyword, docValues = true) private String docValuesTrue;
+		@Field(type = Keyword) private String docValuesTrue;
 		@Field(type = Keyword, docValues = false) private String docValuesFalse;
 		@Field(ignoreMalformed = true) private String ignoreMalformedTrue;
-		@Field(ignoreMalformed = false) private String ignoreMalformedFalse;
+		@Field() private String ignoreMalformedFalse;
 		@Field(indexOptions = IndexOptions.none) private String indexOptionsNone;
 		@Field(indexOptions = IndexOptions.positions) private String indexOptionsPositions;
 		@Field(indexPhrases = true) private String indexPhrasesTrue;
-		@Field(indexPhrases = false) private String indexPhrasesFalse;
+		@Field() private String indexPhrasesFalse;
 		@Field(indexPrefixes = @IndexPrefixes) private String defaultIndexPrefixes;
 		@Field(indexPrefixes = @IndexPrefixes(minChars = 1, maxChars = 10)) private String customIndexPrefixes;
 		@Field private String normsTrue;
@@ -982,7 +977,7 @@ public class MappingBuilderTests extends MappingContextBaseTests {
 		@Field(type = FieldType.Scaled_Float, scalingFactor = 100.0) Double scaledFloat;
 	}
 
-	@Document(indexName = "test-index-configure-dynamic-mapping", type = "dms")
+	@Document(indexName = "test-index-configure-dynamic-mapping")
 	@DynamicMapping(DynamicMappingValue.False)
 	static class ConfigureDynamicMappingEntity {
 

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

@@ -42,28 +42,28 @@ import org.springframework.test.context.ContextConfiguration;
 public class SimpleDynamicTemplatesMappingTests extends MappingContextBaseTests {
 
 	@Test // DATAES-568
-	public void testCorrectDynamicTemplatesMappings() throws IOException {
+	public void testCorrectDynamicTemplatesMappings() {
 
 		String mapping = getMappingBuilder().buildPropertyMapping(SampleDynamicTemplatesEntity.class);
 
-		String EXPECTED_MAPPING_ONE = "{\"test-dynamictemplatestype\":{\"dynamic_templates\":"
+		String EXPECTED_MAPPING_ONE = "{\"dynamic_templates\":"
 				+ "[{\"with_custom_analyzer\":{"
 				+ "\"mapping\":{\"type\":\"string\",\"analyzer\":\"standard_lowercase_asciifolding\"},"
-				+ "\"path_match\":\"names.*\"}}]," + "\"properties\":{\"names\":{\"type\":\"object\"}}}}";
+				+ "\"path_match\":\"names.*\"}}]," + "\"properties\":{\"names\":{\"type\":\"object\"}}}";
 
 		assertThat(mapping).isEqualTo(EXPECTED_MAPPING_ONE);
 	}
 
 	@Test // DATAES-568
-	public void testCorrectDynamicTemplatesMappingsTwo() throws IOException {
+	public void testCorrectDynamicTemplatesMappingsTwo() {
 
 		String mapping = getMappingBuilder().buildPropertyMapping(SampleDynamicTemplatesEntityTwo.class);
-		String EXPECTED_MAPPING_TWO = "{\"test-dynamictemplatestype\":{\"dynamic_templates\":"
+		String EXPECTED_MAPPING_TWO = "{\"dynamic_templates\":"
 				+ "[{\"with_custom_analyzer\":{"
 				+ "\"mapping\":{\"type\":\"string\",\"analyzer\":\"standard_lowercase_asciifolding\"},"
 				+ "\"path_match\":\"names.*\"}}," + "{\"participantA1_with_custom_analyzer\":{"
 				+ "\"mapping\":{\"type\":\"string\",\"analyzer\":\"standard_lowercase_asciifolding\"},"
-				+ "\"path_match\":\"participantA1.*\"}}]," + "\"properties\":{\"names\":{\"type\":\"object\"}}}}";
+				+ "\"path_match\":\"participantA1.*\"}}]," + "\"properties\":{\"names\":{\"type\":\"object\"}}}";
 
 		assertThat(mapping).isEqualTo(EXPECTED_MAPPING_TWO);
 	}
@@ -71,27 +71,27 @@ public class SimpleDynamicTemplatesMappingTests extends MappingContextBaseTests
 	/**
 	 * @author Petr Kukral
 	 */
-	@Document(indexName = "test-dynamictemplates", type = "test-dynamictemplatestype", indexStoreType = "memory",
+	@Document(indexName = "test-dynamictemplates", indexStoreType = "memory",
-			shards = 1, replicas = 0, refreshInterval = "-1")
+			replicas = 0, refreshInterval = "-1")
 	@DynamicTemplates(mappingPath = "/mappings/test-dynamic_templates_mappings.json")
 	static class SampleDynamicTemplatesEntity {
 
 		@Id private String id;
 
-		@Field(type = FieldType.Object) private Map<String, String> names = new HashMap<String, String>();
+		@Field(type = FieldType.Object) private Map<String, String> names = new HashMap<>();
 	}
 
 	/**
 	 * @author Petr Kukral
 	 */
-	@Document(indexName = "test-dynamictemplates", type = "test-dynamictemplatestype", indexStoreType = "memory",
+	@Document(indexName = "test-dynamictemplates", indexStoreType = "memory",
-			shards = 1, replicas = 0, refreshInterval = "-1")
+			replicas = 0, refreshInterval = "-1")
 	@DynamicTemplates(mappingPath = "/mappings/test-dynamic_templates_mappings_two.json")
 	static class SampleDynamicTemplatesEntityTwo {
 
 		@Id private String id;
 
-		@Field(type = FieldType.Object) private Map<String, String> names = new HashMap<String, String>();
+		@Field(type = FieldType.Object) private Map<String, String> names = new HashMap<>();
 	}
 
 }

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

@@ -38,13 +38,13 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
  */
 public class SimpleElasticsearchDateMappingTests extends MappingContextBaseTests {
 
-	private static final String EXPECTED_MAPPING = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true,"
+	private static final String EXPECTED_MAPPING = "{\"properties\":{\"message\":{\"store\":true,"
 			+ "\"type\":\"text\",\"index\":false,\"analyzer\":\"standard\"},\"customFormatDate\":{\"type\":\"date\",\"format\":\"dd.MM.yyyy hh:mm\"},"
 			+ "\"defaultFormatDate\":{\"type\":\"date\"},\"basicFormatDate\":{\""
-			+ "type\":\"date\",\"format\":\"basic_date\"}}}}";
+			+ "type\":\"date\",\"format\":\"basic_date\"}}}";
 
 	@Test // DATAES-568
-	public void testCorrectDateMappings() throws IOException {
+	public void testCorrectDateMappings() {
 
 		String mapping = getMappingBuilder().buildPropertyMapping(SampleDateMappingEntity.class);
 
@@ -55,7 +55,7 @@ public class SimpleElasticsearchDateMappingTests extends MappingContextBaseTests
 	 * @author Jakub Vavrik
 	 */
 	@Data
-	@Document(indexName = "test-index-date-mapping-core", type = "mapping", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-date-mapping-core", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleDateMappingEntity {
 

src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java

@@ -39,7 +39,7 @@ import org.springframework.util.ReflectionUtils;
 public class SimpleElasticsearchPersistentEntityTests {
 
 	@Test
-	public void shouldThrowExceptionGivenVersionPropertyIsNotLong() throws NoSuchFieldException, IntrospectionException {
+	public void shouldThrowExceptionGivenVersionPropertyIsNotLong() {
 		// given
 		TypeInformation typeInformation = ClassTypeInformation.from(EntityWithWrongVersionType.class);
 		SimpleElasticsearchPersistentEntity<EntityWithWrongVersionType> entity = new SimpleElasticsearchPersistentEntity<>(
@@ -51,8 +51,7 @@ public class SimpleElasticsearchPersistentEntityTests {
 	}
 
 	@Test
-	public void shouldThrowExceptionGivenMultipleVersionPropertiesArePresent()
+	public void shouldThrowExceptionGivenMultipleVersionPropertiesArePresent() {
-			throws NoSuchFieldException, IntrospectionException {
 		// given
 		TypeInformation typeInformation = ClassTypeInformation.from(EntityWithMultipleVersionField.class);
 		SimpleElasticsearchPersistentEntity<EntityWithMultipleVersionField> entity = new SimpleElasticsearchPersistentEntity<>(

src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java

@@ -30,6 +30,7 @@ import java.lang.Long;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +42,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.Score;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
@@ -65,14 +67,21 @@ public class CriteriaQueryTests {
 	private final IndexCoordinates index = IndexCoordinates.of("test-index-sample-core-query").withTypes("test-type");
 
 	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() {
+		indexOperations = operations.getIndexOperations();
 
-		operations.deleteIndex(SampleEntity.class);
+		indexOperations.deleteIndex(SampleEntity.class);
-		operations.createIndex(SampleEntity.class);
+		indexOperations.createIndex(SampleEntity.class);
-		operations.putMapping(SampleEntity.class);
+		indexOperations.putMapping(SampleEntity.class);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
+	}
+
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex(SampleEntity.class);
 	}
 
 	@Test
@@ -89,7 +98,7 @@ public class CriteriaQueryTests {
 		indexQuery.setId(documentId);
 		indexQuery.setObject(sampleEntity);
 		operations.index(indexQuery, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(
 				new Criteria("message").contains("test").and("message").contains("some"));
 
@@ -132,7 +141,7 @@ public class CriteriaQueryTests {
 
 		indexQueries.add(indexQuery2);
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(
 				new Criteria("message").contains("some").or("message").contains("test"));
 
@@ -163,7 +172,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria().and(new Criteria("message").contains("some")));
 
 		// when
@@ -194,7 +203,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria().or(new Criteria("message").contains("some")));
 
 		// when
@@ -223,7 +232,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message"));
 
 		// when
@@ -265,7 +274,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message"));
 
 		// when
@@ -307,7 +316,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		Criteria criteria = new Criteria("message").endsWith("end");
 		CriteriaQuery criteriaQuery = new CriteriaQuery(criteria);
 
@@ -349,7 +358,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		Criteria criteria = new Criteria("message").startsWith("start");
 		CriteriaQuery criteriaQuery = new CriteriaQuery(criteria);
 
@@ -391,7 +400,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("contains"));
 
 		// when
@@ -432,7 +441,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").expression("+elasticsearch || test"));
 
 		// when
@@ -473,7 +482,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(
 				new Criteria("message").startsWith("some").endsWith("search").contains("message").is("some message search"));
 
@@ -515,7 +524,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("foo").not());
 
 		// when
@@ -559,7 +568,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").between(100, 150));
 
 		// when
@@ -601,7 +610,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").between(350, null));
 
 		// when
@@ -644,7 +653,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").between(null, 550));
 
 		// when
@@ -687,7 +696,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").lessThanEqual(750));
 
 		// when
@@ -730,7 +739,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("rate").greaterThanEqual(950));
 
 		// when
@@ -773,7 +782,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(indexQuery2);
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("foo").boost(1));
 
 		// when
@@ -794,7 +803,7 @@ public class CriteriaQueryTests {
 		indexQueries.add(buildIndex(SampleEntity.builder().id("3").message("ac").build()));
 
 		operations.bulkIndex(indexQueries, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 
 		// when
 		CriteriaQuery criteriaQuery = new CriteriaQuery(
@@ -821,7 +830,7 @@ public class CriteriaQueryTests {
 		indexQuery.setId(documentId);
 		indexQuery.setObject(sampleEntity);
 		operations.index(indexQuery, index);
-		operations.refresh(SampleEntity.class);
+		indexOperations.refresh(SampleEntity.class);
 
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("Hello World!"));
 
@@ -837,7 +846,7 @@ public class CriteriaQueryTests {
 	@Getter
 	@NoArgsConstructor
 	@AllArgsConstructor
-	@Document(indexName = "test-index-sample-core-query", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-core-query", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleEntity {
 

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java

@@ -112,7 +112,7 @@ class ClusterConnection implements ExtensionContext.Store.CloseableResource {
 	}
 
 	@Override
-	public void close() throws Exception {
+	public void close() {
 
 		if (node != null) {
 			LOGGER.debug("closing node");

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java

@@ -24,7 +24,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.RestClients;
 import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration;
-import org.springframework.util.Assert;
 
 /**
  * Configuration for Spring Data Elasticsearch using

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationTest.java

@@ -21,7 +21,6 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Wraps the {@link SpringDataElasticsearchExtension}.

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/SpringDataElasticsearchExtension.java

@@ -57,7 +57,7 @@ public class SpringDataElasticsearchExtension
 	private static final Lock initLock = new ReentrantLock();
 
 	@Override
-	public void beforeAll(ExtensionContext extensionContext) throws Exception {
+	public void beforeAll(ExtensionContext extensionContext) {
 		initLock.lock();
 		try {
 			ExtensionContext.Store store = getStore(extensionContext);

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/CdiProductRepository.java

@@ -27,5 +27,6 @@ import org.springframework.data.repository.CrudRepository;
  */
 public interface CdiProductRepository extends CrudRepository<CdiRepositoryTests.Product, String> {
 
+	@Override
 	Optional<CdiRepositoryTests.Product> findById(String id);
 }

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/CdiRepositoryTests.java

@@ -158,7 +158,7 @@ public class CdiRepositoryTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-product-cdi-repository", type = "test-product-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-product-cdi-repository", replicas = 0,
 			refreshInterval = "-1")
 	static class Product {
 
@@ -188,7 +188,7 @@ public class CdiRepositoryTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-person-cdi-repository", type = "user", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-person-cdi-repository", replicas = 0,
 			refreshInterval = "-1")
 	static class Person {
 
@@ -206,7 +206,7 @@ public class CdiRepositoryTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-book-cdi-repository", type = "book", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-book-cdi-repository", replicas = 0,
 			refreshInterval = "-1")
 	static class Book {
 

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/OtherQualifier.java

@@ -25,7 +25,7 @@ import javax.inject.Qualifier;
 
 /**
  * @author Mark Paluch
- * @see DATAES-234
+ * @see <a href="https://jira.spring.io/browse/DATAES-234">DATAES-234</a>
  */
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/PersonDB.java

@@ -25,7 +25,7 @@ import javax.inject.Qualifier;
 
 /**
  * @author Mark Paluch
- * @see DATAES-234
+ * @see <a href="https://jira.spring.io/browse/DATAES-234">DATAES-234</a>
  */
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/QualifiedProductRepository.java

@@ -19,7 +19,7 @@ import org.springframework.data.repository.CrudRepository;
 
 /**
  * @author Mark Paluch
- * @see DATAES-234
+ * @see <a href="https://jira.spring.io/browse/DATAES-234">DATAES-234</a>
  */
 @PersonDB
 @OtherQualifier

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepository.java

@@ -19,7 +19,7 @@ import org.springframework.data.repository.Repository;
 
 /**
  * @author Mark Paluch
- * @see DATAES-113
+ * @see <a href="https://jira.spring.io/browse/DATAES-113">DATAES-113</a>
  */
 public interface SamplePersonRepository
 		extends Repository<CdiRepositoryTests.Person, Long>, SamplePersonRepositoryCustom {

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepositoryCustom.java

@@ -17,8 +17,8 @@
 package org.springframework.data.elasticsearch.repositories.cdi;
 
 /**
- * @see DATAES-113
  * @author Mark Paluch
+ * @see <a href="https://jira.spring.io/browse/DATAES-113">DATAES-113</a>
  */
 interface SamplePersonRepositoryCustom {
 

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepositoryImpl.java

@@ -17,8 +17,8 @@
 package org.springframework.data.elasticsearch.repositories.cdi;
 
 /**
- * @see DATAES-113
  * @author Mark Paluch
+ * @see <a href="https://jira.spring.io/browse/DATAES-113">DATAES-113</a>
  */
 class SamplePersonRepositoryImpl implements SamplePersonRepositoryCustom {
 

src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexCustomMethodRepositoryTests.java

@@ -20,6 +20,7 @@ import static org.springframework.data.elasticsearch.annotations.FieldType.*;
 
 import lombok.Data;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
@@ -52,10 +54,17 @@ public class ComplexCustomMethodRepositoryTests {
 	@Autowired private ComplexElasticsearchRepository complexRepository;
 
 	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() {
-		IndexInitializer.init(operations, SampleEntity.class);
+		indexOperations = operations.getIndexOperations();
+		IndexInitializer.init(indexOperations, SampleEntity.class);
+	}
+
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex(SampleEntity.class);
 	}
 
 	@Test
@@ -71,8 +80,8 @@ public class ComplexCustomMethodRepositoryTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-sample-repositories-complex-custommethod-autowiring", type = "test-type",
+	@Document(indexName = "test-index-sample-repositories-complex-custommethod-autowiring",
-			shards = 1, replicas = 0, refreshInterval = "-1")
+			replicas = 0, refreshInterval = "-1")
 	static class SampleEntity {
 
 		@Id private String id;

src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexElasticsearchRepositoryCustom.java

@@ -21,5 +21,5 @@ package org.springframework.data.elasticsearch.repositories.complex.custommethod
  */
 public interface ComplexElasticsearchRepositoryCustom {
 
-	public String doSomethingSpecial();
+	String doSomethingSpecial();
 }

src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/manualwiring/ComplexCustomMethodRepositoryManualWiringTests.java

@@ -20,6 +20,7 @@ import static org.springframework.data.elasticsearch.annotations.FieldType.*;
 
 import lombok.Data;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
@@ -51,10 +53,17 @@ public class ComplexCustomMethodRepositoryManualWiringTests {
 	@Autowired private ComplexElasticsearchRepositoryManualWiring complexRepository;
 
 	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() {
-		IndexInitializer.init(operations, SampleEntity.class);
+		indexOperations = operations.getIndexOperations();
+		IndexInitializer.init(indexOperations, SampleEntity.class);
+	}
+
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex(SampleEntity.class);
 	}
 
 	@Test
@@ -70,7 +79,7 @@ public class ComplexCustomMethodRepositoryManualWiringTests {
 	}
 
 	@Data
-	@Document(indexName = "test-index-sample-repository-manual-wiring", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-repository-manual-wiring", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleEntity {
 

src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryBaseTests.java

@@ -32,6 +32,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
@@ -44,10 +46,13 @@ import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.Query;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.elasticsearch.utils.IndexInitializer;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
@@ -70,6 +75,20 @@ public abstract class CustomMethodRepositoryBaseTests {
 
 	@Autowired private SampleStreamingCustomMethodRepository streamingRepository;
 
+	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
+
+	@BeforeEach
+	public void before() {
+		indexOperations = operations.getIndexOperations();
+		IndexInitializer.init(indexOperations, SampleEntity.class);
+	}
+
+	@AfterEach
+	void after() {
+		indexOperations.deleteIndex(SampleEntity.class);
+	}
+
 	@Test
 	public void shouldExecuteCustomMethod() {
 
@@ -1367,7 +1386,7 @@ public abstract class CustomMethodRepositoryBaseTests {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	@Builder
-	@Document(indexName = "test-index-sample-repositories-custo-method", type = "test-type", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-sample-repositories-custo-method", replicas = 0,
 			refreshInterval = "-1")
 	static class SampleEntity {
 

src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryRestTests.java

@@ -15,14 +15,10 @@
  */
 package org.springframework.data.elasticsearch.repositories.custommethod;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
-import org.springframework.data.elasticsearch.utils.IndexInitializer;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -39,11 +35,4 @@ public class CustomMethodRepositoryRestTests extends CustomMethodRepositoryBaseT
 			basePackages = { "org.springframework.data.elasticsearch.repositories.custommethod" },
 			considerNestedRepositories = true)
 	static class Config {}
-
-	@Autowired private ElasticsearchRestTemplate elasticsearchTemplate;
-
-	@BeforeEach
-	public void before() {
-		IndexInitializer.init(elasticsearchTemplate, SampleEntity.class);
-	}
 }

src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryTests.java

@@ -15,14 +15,10 @@
  */
 package org.springframework.data.elasticsearch.repositories.custommethod;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
-import org.springframework.data.elasticsearch.utils.IndexInitializer;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -40,10 +36,4 @@ public class CustomMethodRepositoryTests extends CustomMethodRepositoryBaseTests
 			considerNestedRepositories = true)
 	static class Config {}
 
-	@Autowired private ElasticsearchOperations operations;
-
-	@BeforeEach
-	public void before() {
-		IndexInitializer.init(operations, SampleEntity.class);
-	}
 }

src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepositoryTests.java

@@ -31,6 +31,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
@@ -57,16 +58,17 @@ public class DoubleIDRepositoryTests {
 	@Autowired private DoubleIDRepository repository;
 
 	@Autowired private ElasticsearchOperations operations;
+	private IndexOperations indexOperations;
 
 	@BeforeEach
 	public void before() {
-		IndexInitializer.init(operations, DoubleIDEntity.class);
+		indexOperations = operations.getIndexOperations();
+		IndexInitializer.init(indexOperations, DoubleIDEntity.class);
 	}
 
 	@AfterEach
 	public void after() {
-
+		indexOperations.deleteIndex(DoubleIDEntity.class);
-		operations.deleteIndex(DoubleIDEntity.class);
 	}
 
 	@Test
@@ -119,7 +121,7 @@ public class DoubleIDRepositoryTests {
 	 * @author Mohsin Husen
 	 */
 
-	@Document(indexName = "test-index-double-keyed-entity", type = "double-keyed-entity", shards = 1, replicas = 0,
+	@Document(indexName = "test-index-double-keyed-entity", replicas = 0,
 			refreshInterval = "-1")
 	static class DoubleIDEntity {