Remove deprecated code.

Original Pull Request #1782
Closes #1781

Author: sothawo

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

@@ -1102,58 +1102,6 @@ default Mono<Void> refreshIndex(RefreshRequest refreshRequest) {
 		 */
 		Mono<Void> refreshIndex(HttpHeaders headers, RefreshRequest refreshRequest);
 
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
-		 *      Put Mapping API on elastic.co</a>
-		 * @deprecated since 4.1, use {@link #putMapping(Consumer)}
-		 */
-		@Deprecated
-		default Mono<Boolean> updateMapping(
-				Consumer<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest> consumer) {
-			return putMapping(consumer);
-		}
-
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param putMappingRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
-		 *      Put Mapping API on elastic.co</a>
-		 * @deprecated since 4.1, use {@link #putMapping(PutMappingRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> updateMapping(
-				org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
-			return putMapping(putMappingRequest);
-		}
-
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param putMappingRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
-		 *      Put Mapping API on elastic.co</a>
-		 * @deprecated since 4.1, use {@link #putMapping(HttpHeaders, PutMappingRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> updateMapping(HttpHeaders headers,
-				org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
-			return putMapping(headers, putMappingRequest);
-		}
-
 		/**
 		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
 		 * {@literal indices} API.

Diff for: src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

@@ -841,8 +841,7 @@ public static Request putMapping(PutMappingRequest putMappingRequest) {
 
 		RequestConverters.Params parameters = new RequestConverters.Params(request) //
 				.withTimeout(putMappingRequest.timeout()) //
-				.withMasterTimeout(putMappingRequest.masterNodeTimeout()) //
-				.withIncludeTypeName(false);
+				.withMasterTimeout(putMappingRequest.masterNodeTimeout());
 		request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
 		return request;
 	}
@@ -853,8 +852,7 @@ public static Request putMapping(org.elasticsearch.client.indices.PutMappingRequ
 
 		new RequestConverters.Params(request) //
 				.withTimeout(putMappingRequest.timeout()) //
-				.withMasterTimeout(putMappingRequest.masterNodeTimeout()) //
-				.withIncludeTypeName(false);
+				.withMasterTimeout(putMappingRequest.masterNodeTimeout());
 		request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
 		return request;
 	}
@@ -880,7 +878,6 @@ public static Request getMapping(GetMappingsRequest getMappingsRequest) {
 		parameters.withMasterTimeout(getMappingsRequest.masterNodeTimeout());
 		parameters.withIndicesOptions(getMappingsRequest.indicesOptions());
 		parameters.withLocal(getMappingsRequest.local());
-		parameters.withIncludeTypeName(false);
 		return request;
 	}
 
@@ -893,7 +890,6 @@ public static Request getMapping(org.elasticsearch.client.indices.GetMappingsReq
 		parameters.withMasterTimeout(getMappingsRequest.masterNodeTimeout());
 		parameters.withIndicesOptions(getMappingsRequest.indicesOptions());
 		parameters.withLocal(getMappingsRequest.local());
-		parameters.withIncludeTypeName(false);
 		return request;
 	}
 
@@ -1000,7 +996,6 @@ public static Request getFieldMapping(GetFieldMappingsRequest getFieldMappingsRe
 		RequestConverters.Params parameters = new Params(request);
 		parameters.withIndicesOptions(getFieldMappingsRequest.indicesOptions());
 		parameters.withIncludeDefaults(getFieldMappingsRequest.includeDefaults());
-		parameters.withIncludeTypeName(false);
 		return request;
 	}
 
@@ -1372,18 +1367,6 @@ Params withWaitForEvents(Priority waitForEvents) {
 			}
 			return this;
 		}
-
-		/**
-		 * sets the include_type_name parameter. Needed for Elasticsearch 7 to be used with the mapping types still
-		 * available. Will be removed again when Elasticsearch drops the support for this parameter in Elasticsearch 8.
-		 *
-		 * @deprecated since 4.0
-		 * @since 4.0
-		 */
-		@Deprecated
-		Params withIncludeTypeName(boolean includeTypeName) {
-			return putParam("include_type_name", String.valueOf(includeTypeName));
-		}
 	}
 
 	/**

Diff for: src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java

@@ -35,7 +35,6 @@ public void init() {
 		RepositoryBeanDefinitionParser parser = new RepositoryBeanDefinitionParser(extension);
 
 		registerBeanDefinitionParser("repositories", parser);
-		registerBeanDefinitionParser("node-client", new NodeClientBeanDefinitionParser());
 		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
 		registerBeanDefinitionParser("rest-client", new RestClientBeanDefinitionParser());
 	}

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

@@ -41,32 +41,22 @@
 
 	/**
 	 * Configures the {@link AuditorAware} bean to be used to lookup the current principal.
-	 *
-	 * @return
 	 */
 	String auditorAwareRef() default "";
 
 	/**
 	 * Configures whether the creation and modification dates are set. Defaults to {@literal true}.
-	 *
-	 * @return
 	 */
 	boolean setDates() default true;
 
 	/**
 	 * Configures whether the entity shall be marked as modified on creation. Defaults to {@literal true}.
-	 *
-	 * @return
 	 */
 	boolean modifyOnCreate() default true;
 
 	/**
 	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
 	 * used for setting creation and modification dates.
-	 *
-	 * @return
-	 * @deprecated since 4.1
 	 */
-	@Deprecated
 	String dateTimeProviderRef() default "";
 }