Cleanup deprecations from 4.0. (#1671)

Original Pull Request #1671 
Closes #1669

Author: sothawo

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

@@ -9,24 +9,41 @@ This section describes breaking changes from version 4.1.x to 4.2.x and how remo
 [[elasticsearch-migration-guide-4.1-4.2.removal]]
 == Removals
 
+The `@Score` annotation that was used to set the score return value in an entity was deprecated in version 4.0 and has been removed.
+Scroe values are returned in the `SearchHit` instances that encapsulate the returned entities.
+
+The `org.springframework.data.elasticsearch.ElasticsearchException` class has been removed.
+The remaining usages have been replaced with `org.springframework.data.mapping.MappingException` and `org.springframework.dao.InvalidDataAccessApiUsageException`.
+
+The deprecated `ScoredPage`, `ScrolledPage` `@AggregatedPage` and implementations has been removed.
+
+The deprecated `GetQuery` and `DeleteQuery` have been removed.
+
+The deprecated `find` methods from `ReactiveSearchOperations` and `ReactiveDocumentOperations` have been removed.
+
 [[elasticsearch-migration-guide-4.1-4.2.breaking-changes]]
 == Breaking Changes
 
 === RefreshPolicy
 
 ==== Enum package changed
 
-It was possible in 4.1 to configure the refresh policy for the `ReactiveElasticsearchTemplate` by overriding the method `AbstractReactiveElasticsearchConfiguration.refreshPolicy()` in a custom configuration class. The return value of this method was an instance of the class `org.elasticsearch.action.support.WriteRequest.RefreshPolicy`.
+It was possible in 4.1 to configure the refresh policy for the `ReactiveElasticsearchTemplate` by overriding the method `AbstractReactiveElasticsearchConfiguration.refreshPolicy()` in a custom configuration class.
+The return value of this method was an instance of the class `org.elasticsearch.action.support.WriteRequest.RefreshPolicy`.
 
-Now the configuration must return `org.springframework.data.elasticsearch.core.RefreshPolicy`. This enum has the same values and triggers the same behaviour as before, so only the `import` statement has to be adjusted.
+Now the configuration must return `org.springframework.data.elasticsearch.core.RefreshPolicy`.
+This enum has the same values and triggers the same behaviour as before, so only the `import` statement has to be adjusted.
 
 ==== Refresh behaviour
 
-`ElasticsearchOperations` and `ReactiveElasticsearchOperations` now explicitly use the `RefreshPolicy` set on the template for write requests if not null. If the refresh policy is null, then nothing special is done, so the cluster defaults are used. `ElasticsearchOperations` was always using the cluster default before this version.
+`ElasticsearchOperations` and `ReactiveElasticsearchOperations` now explicitly use the `RefreshPolicy` set on the template for write requests if not null.
+If the refresh policy is null, then nothing special is done, so the cluster defaults are used. `ElasticsearchOperations` was always using the cluster default before this version.
 
-The provided implementations for `ElasticsearchRepository` and `ReactiveElasticsearchRepository` will do an explicit refresh when the refresh policy is null. This is the same behaviour as in previous versions. If a refresh policy is set, then it will be used by the repositories as well.
+The provided implementations for `ElasticsearchRepository` and `ReactiveElasticsearchRepository` will do an explicit refresh when the refresh policy is null.
+This is the same behaviour as in previous versions.
+If a refresh policy is set, then it will be used by the repositories as well.
 
 ==== Refresh configuration
 
-When configuring Spring Data Elasticsearch like described in <<elasticsearch.clients>> by using `ElasticsearchConfigurationSupport`, `AbstractElasticsearchConfiguration` or `AbstractReactiveElasticsearchConfiguration` the refresh policy will be initialized to `null`. Previously the reactive code initialized this to `IMMEDIATE`, now reactive and
-non-reactive code show the same behaviour.
+When configuring Spring Data Elasticsearch like described in <<elasticsearch.clients>> by using `ElasticsearchConfigurationSupport`, `AbstractElasticsearchConfiguration` or `AbstractReactiveElasticsearchConfiguration` the refresh policy will be initialized to `null`.
+Previously the reactive code initialized this to `IMMEDIATE`, now reactive and non-reactive code show the same behaviour.

src/main/java/org/springframework/data/elasticsearch/ElasticsearchException.java

@@ -53,7 +53,6 @@
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.GetQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
@@ -249,23 +248,11 @@ public <T> T get(String id, Class<T> clazz) {
 		return get(id, clazz, getIndexCoordinatesFor(clazz));
 	}
 
-	@Override
-	@Nullable
-	public <T> T get(GetQuery query, Class<T> clazz, IndexCoordinates index) {
-		return get(query.getId(), clazz, index);
-	}
-
 	@Override
 	public <T> List<T> multiGet(Query query, Class<T> clazz) {
 		return multiGet(query, clazz, getIndexCoordinatesFor(clazz));
 	}
 
-	@Override
-	@Nullable
-	public <T> T queryForObject(GetQuery query, Class<T> clazz) {
-		return get(query.getId(), clazz, getIndexCoordinatesFor(clazz));
-	}
-
 	@Override
 	public boolean exists(String id, Class<?> clazz) {
 		return exists(id, getIndexCoordinatesFor(clazz));
@@ -400,11 +387,6 @@ public long count(Query query, Class<?> clazz) {
 		return count(query, clazz, getIndexCoordinatesFor(clazz));
 	}
 
-	@Override
-	public <T> CloseableIterator<T> stream(Query query, Class<T> clazz, IndexCoordinates index) {
-		return (CloseableIterator<T>) SearchHitSupport.unwrapSearchHits(searchForStream(query, clazz, index));
-	}
-
 	@Override
 	public <T> SearchHitsIterator<T> searchForStream(Query query, Class<T> clazz) {
 		return searchForStream(query, clazz, getIndexCoordinatesFor(clazz));

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

@@ -19,8 +19,6 @@
 
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.DeleteQuery;
-import org.springframework.data.elasticsearch.core.query.GetQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.UpdateByQueryResponse;
@@ -310,41 +308,4 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
 	 * @since 4.2
 	 */
 	UpdateByQueryResponse updateByQuery(UpdateQuery updateQuery, IndexCoordinates index);
-
-	// region deprecated
-	/**
-	 * Delete all records matching the query.
-	 *
-	 * @param query query defining the objects
-	 * @param index the index where to delete the records
-	 * @deprecated since 4.0, use {@link #delete(Query, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	void delete(DeleteQuery query, IndexCoordinates index);
-
-	/**
-	 * Retrieves an object from an index.
-	 *
-	 * @param query the query defining the id of the object to get
-	 * @param clazz the type of the object to be returned
-	 * @param index the index from which the object is read.
-	 * @return the found object
-	 * @deprecated since 4.0, use {@link #get(String, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	@Nullable
-	<T> T get(GetQuery query, Class<T> clazz, IndexCoordinates index);
-
-	/**
-	 * Retrieves an object from an index.
-	 *
-	 * @param query the query defining the id of the object to get
-	 * @param clazz the type of the object to be returned
-	 * @return the found object
-	 * @deprecated since 4.0, use {@link #get(String, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	@Nullable
-	<T> T queryForObject(GetQuery query, Class<T> clazz);
-	// endregion
 }