Move classes using Elasticsearch code to separate package.

Original Pull Request #1991 
Closes #1947

Author: sothawo

src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc

@@ -0,0 +1,14 @@
+[[elasticsearch-migration-guide-4.3-4.4]]
+= Upgrading from 4.3.x to 4.4.x
+
+This section describes breaking changes from version 4.3.x to 4.4.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-4.3-4.4.deprecations]]
+== Deprecations
+
+[[elasticsearch-migration-guide-4.3-4.4.breaking-changes]]
+== Breaking Changes
+
+=== Package changes
+
+* The package `org.springframework.data.elasticsearch.core.clients.elasticsearch7` has been renamed to `org.springframework.data.elasticsearch.core.backend.elasticsearch7`.

src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchRestTransportTemplate.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/AbstractElasticsearchRestTransportTemplate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
+package org.springframework.data.elasticsearch.backend.elasticsearch7;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,10 +34,13 @@
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.springframework.data.elasticsearch.BulkFailureException;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
+import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.util.Assert;
 

src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java

@@ -5,15 +5,15 @@
  * 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
+ *      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.core;
+package org.springframework.data.elasticsearch.clients.elasticsearch7;
 
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 

src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
+package org.springframework.data.elasticsearch.clients.elasticsearch7;
 
 import static org.elasticsearch.index.query.Operator.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;

src/main/java/org/springframework/data/elasticsearch/core/clients/elasticsearch7/ElasticsearchAggregation.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.clients.elasticsearch7;
+package org.springframework.data.elasticsearch.clients.elasticsearch7;
 
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.springframework.data.elasticsearch.core.AggregationContainer;

src/main/java/org/springframework/data/elasticsearch/core/clients/elasticsearch7/ElasticsearchAggregations.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.clients.elasticsearch7;
+package org.springframework.data.elasticsearch.clients.elasticsearch7;
 
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.springframework.data.elasticsearch.core.AggregationsContainer;

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslator.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
+package org.springframework.data.elasticsearch.backend.elasticsearch7;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
+package org.springframework.data.elasticsearch.backend.elasticsearch7;
 
 import java.io.IOException;
 import java.util.List;
@@ -45,18 +45,27 @@
 import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.cluster.ElasticsearchClusterOperations;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
+import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.IndexOperations;
+import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.RefreshPolicy;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.SearchScrollHits;
 import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
-import org.springframework.data.elasticsearch.support.SearchHitsUtil;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -147,7 +156,7 @@ public IndexOperations indexOps(IndexCoordinates index) {
 	// region ClusterOperations
 	@Override
 	public ClusterOperations cluster() {
-		return ClusterOperations.forTemplate(this);
+		return ElasticsearchClusterOperations.forTemplate(this);
 	}
 	// endregion
 

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchTemplate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
+package org.springframework.data.elasticsearch.backend.elasticsearch7;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,18 +46,27 @@
 import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.cluster.ElasticsearchClusterOperations;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
+import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.IndexOperations;
+import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.RefreshPolicy;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.SearchScrollHits;
 import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
-import org.springframework.data.elasticsearch.support.SearchHitsUtil;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -151,7 +160,7 @@ public IndexOperations indexOps(IndexCoordinates index) {
 	// region ClusterOperations
 	@Override
 	public ClusterOperations cluster() {
-		return ClusterOperations.forTemplate(this);
+		return ElasticsearchClusterOperations.forTemplate(this);
 	}
 	// endregion
 

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java renamed to src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
+package org.springframework.data.elasticsearch.backend.elasticsearch7;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -56,17 +56,21 @@
 import org.springframework.data.elasticsearch.BulkFailureException;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
-import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.cluster.DefaultReactiveClusterOperations;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.ElasticsearchAggregation;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
+import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
+import org.springframework.data.elasticsearch.core.*;
 import org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity;
-import org.springframework.data.elasticsearch.core.clients.elasticsearch7.ElasticsearchAggregation;
-import org.springframework.data.elasticsearch.core.cluster.DefaultReactiveClusterOperations;
 import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
 import org.springframework.data.elasticsearch.core.document.SearchDocument;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.event.ReactiveAfterConvertCallback;
 import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback;
 import org.springframework.data.elasticsearch.core.event.ReactiveBeforeConvertCallback;
@@ -77,7 +81,6 @@
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;