DATAES-841 - Remove deprecated type mappings code.

Original PR: spring-projects#468

Author: sothawo

src/main/asciidoc/preface.adoc

@@ -10,6 +10,7 @@ You will notice similarities to the Spring data solr and mongodb support in the
 
 include::reference/elasticsearch-new.adoc[leveloffset=+1]
 include::reference/elasticsearch-migration-guide-3.2-4.0.adoc[leveloffset=+1]
+include::reference/elasticsearch-migration-guide-4.0-4.1.adoc[leveloffset=+1]
 
 [[preface.metadata]]
 == Project Metadata

src/main/asciidoc/reference/elasticsearch-migration-guide-4.0-4.1.adoc

@@ -0,0 +1,9 @@
+[[elasticsearch-migration-guide-4.0-4.1]]
+== Upgrading from 4.0.x to 4.1.x
+
+This section describes breaking changes from version 4.0.x to 4.1.x and how removed features can be replaced by new introduced features.
+
+=== Removals
+
+The _type mappings_ parameters of the `@Document` annotation and the `IndexCoordinates` object were removed. They had been deprecated in Spring Data Elasticsearch 4.0 and their values weren't used anymore.
+

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

@@ -53,17 +53,6 @@
 	 */
 	String indexName();
 
-	/**
-	 * Mapping type name. <br/>
-	 * deprecated as Elasticsearch does not support this anymore
-	 * (@see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/7.3/removal-of-types.html">Elastisearch removal of types documentation</a>) and will remove it in
-	 * Elasticsearch 8.
-	 *
-	 * @deprecated since 4.0
-	 */
-	@Deprecated
-	String type() default "";
-
 	/**
 	 * Use server-side settings when creating the index.
 	 */

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

@@ -17,7 +17,6 @@
 
 import java.util.Arrays;
 
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -34,29 +33,15 @@ public class IndexCoordinates {
 	public static final String TYPE = "_doc";
 
 	private final String[] indexNames;
-	private final String[] typeNames;
 
 	public static IndexCoordinates of(String... indexNames) {
 		Assert.notNull(indexNames, "indexNames must not be null");
-		return new IndexCoordinates(indexNames, null);
+		return new IndexCoordinates(indexNames);
 	}
 
-	private IndexCoordinates(String[] indexNames, @Nullable String[] typeNames) {
+	private IndexCoordinates(String[] indexNames) {
 		Assert.notEmpty(indexNames, "indexNames may not be null or empty");
 		this.indexNames = indexNames;
-		this.typeNames = typeNames != null ? typeNames : new String[] {};
-	}
-
-	/**
-	 * Using Index types is deprecated in Elasticsearch.
-	 * 
-	 * @param typeNames
-	 * @return
-	 */
-	@Deprecated
-	public IndexCoordinates withTypes(String... typeNames) {
-		Assert.notEmpty(typeNames, "typeNames must not be null");
-		return new IndexCoordinates(this.indexNames, typeNames);
 	}
 
 	public String getIndexName() {
@@ -67,20 +52,8 @@ public String[] getIndexNames() {
 		return Arrays.copyOf(indexNames, indexNames.length);
 	}
 
-	@Deprecated
-	@Nullable
-	public String getTypeName() {
-		return typeNames.length > 0 ? typeNames[0] : null;
-	}
-
-	@Deprecated
-	public String[] getTypeNames() {
-		return Arrays.copyOf(typeNames, typeNames.length);
-	}
-
 	@Override
 	public String toString() {
-		return "IndexCoordinates{" + "indexNames=" + Arrays.toString(indexNames) + ", typeNames="
-				+ Arrays.toString(typeNames) + '}';
+		return "IndexCoordinates{" + "indexNames=" + Arrays.toString(indexNames) + '}';
 	}
 }

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

@@ -15,9 +15,6 @@
  */
 package org.springframework.data.elasticsearch.core.mapping;
 
-import static org.springframework.util.StringUtils.*;
-
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
@@ -66,7 +63,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 	private final SpelExpressionParser parser;
 
 	private @Nullable String indexName;
-	private @Nullable String indexType;
 	private boolean useServerConfiguration;
 	private short shards;
 	private short replicas;
@@ -93,7 +89,6 @@ public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
 			Assert.hasText(document.indexName(),
 					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
 			this.indexName = document.indexName();
-			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
 			this.useServerConfiguration = document.useServerConfiguration();
 			this.shards = document.shards();
 			this.replicas = document.replicas();
@@ -124,19 +119,9 @@ private String getIndexName() {
 		return getTypeInformation().getType().getSimpleName();
 	}
 
-	private String getIndexType() {
-
-		if (indexType != null) {
-			Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
-			return expression.getValue(context, String.class);
-		}
-
-		return "";
-	}
-
 	@Override
 	public IndexCoordinates getIndexCoordinates() {
-		return IndexCoordinates.of(getIndexName()).withTypes(getIndexType());
+		return IndexCoordinates.of(getIndexName());
 	}
 
 	@Nullable

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

@@ -90,8 +90,7 @@ private Object execute(ElasticsearchParameterAccessor parameterAccessor) {
 
 		Class<?> targetType = processor.getReturnedType().getTypeToRead();
 		String indexName = queryMethod.getEntityInformation().getIndexName();
-		String indexTypeName = queryMethod.getEntityInformation().getIndexTypeName();
-		IndexCoordinates index = IndexCoordinates.of(indexName).withTypes(indexTypeName);
+		IndexCoordinates index = IndexCoordinates.of(indexName);
 
 		ReactiveElasticsearchQueryExecution execution = getExecution(parameterAccessor,
 				new ResultProcessingConverter(processor));

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

@@ -121,7 +121,7 @@ public void shouldIndexInitialLevelNestedObject() {
 		indexQueries.add(indexQuery1);
 		indexQueries.add(indexQuery2);
 
-		IndexCoordinates index = IndexCoordinates.of("test-index-person").withTypes("user");
+		IndexCoordinates index = IndexCoordinates.of("test-index-person");
 		operations.bulkIndex(indexQueries, index);
 		operations.indexOps(Person.class).refresh();
 
@@ -141,13 +141,12 @@ public void shouldIndexMultipleLevelNestedObject() {
 		List<IndexQuery> indexQueries = createPerson();
 
 		// when
-		operations.bulkIndex(indexQueries,
-				IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user"));
+		operations.bulkIndex(indexQueries, IndexCoordinates.of("test-index-person-multiple-level-nested"));
 		operations.indexOps(PersonMultipleLevelNested.class).refresh();
 
 		// then
 		PersonMultipleLevelNested personIndexed = operations.get("1", PersonMultipleLevelNested.class,
-				IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user"));
+				IndexCoordinates.of("test-index-person-multiple-level-nested"));
 		assertThat(personIndexed).isNotNull();
 	}
 
@@ -158,8 +157,7 @@ public void shouldIndexMultipleLevelNestedObjectWithIncludeInParent() {
 		List<IndexQuery> indexQueries = createPerson();
 
 		// when
-		operations.bulkIndex(indexQueries,
-				IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user"));
+		operations.bulkIndex(indexQueries, IndexCoordinates.of("test-index-person-multiple-level-nested"));
 
 		// then
 		Map<String, Object> mapping = operations.indexOps(PersonMultipleLevelNested.class).getMapping();
@@ -178,7 +176,7 @@ public void shouldSearchUsingNestedQueryOnMultipleLevelNestedObject() {
 		List<IndexQuery> indexQueries = createPerson();
 
 		// when
-		IndexCoordinates index = IndexCoordinates.of("test-index-person-multiple-level-nested").withTypes("user");
+		IndexCoordinates index = IndexCoordinates.of("test-index-person-multiple-level-nested");
 		operations.bulkIndex(indexQueries, index);
 		operations.indexOps(PersonMultipleLevelNested.class).refresh();
 
@@ -318,7 +316,7 @@ public void shouldSearchBooksForPersonInitialLevelNestedType() {
 		indexQueries.add(indexQuery1);
 		indexQueries.add(indexQuery2);
 
-		IndexCoordinates index = IndexCoordinates.of("test-index-person").withTypes("user");
+		IndexCoordinates index = IndexCoordinates.of("test-index-person");
 		operations.bulkIndex(indexQueries, index);
 		operations.indexOps(Person.class).refresh();
 
@@ -367,7 +365,7 @@ public void shouldIndexAndSearchMapAsNestedType() {
 		indexQueries.add(indexQuery2);
 
 		// when
-		IndexCoordinates index = IndexCoordinates.of("test-index-book-nested-objects").withTypes("book");
+		IndexCoordinates index = IndexCoordinates.of("test-index-book-nested-objects");
 		operations.bulkIndex(indexQueries, index);
 		operations.indexOps(Book.class).refresh();