Skip to content

Commit 94c95ee

Browse files
sothawosothawo
authored
Move classes using Elasticsearch code to separate package.
Original Pull Request #1991 Closes #1947
1 parent 3eff80e commit 94c95ee

File tree

121 files changed

+1034
-804
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1034
-804
lines changed

Diff for: ‎src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[[elasticsearch-migration-guide-4.3-4.4]]
2+
= Upgrading from 4.3.x to 4.4.x
3+
4+
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.
5+
6+
[[elasticsearch-migration-guide-4.3-4.4.deprecations]]
7+
== Deprecations
8+
9+
[[elasticsearch-migration-guide-4.3-4.4.breaking-changes]]
10+
== Breaking Changes
11+
12+
=== Package changes
13+
14+
* The package `org.springframework.data.elasticsearch.core.clients.elasticsearch7` has been renamed to `org.springframework.data.elasticsearch.core.backend.elasticsearch7`.

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchRestTransportTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/AbstractElasticsearchRestTransportTemplate.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import java.util.ArrayList;
1919
import java.util.HashMap;
@@ -34,10 +34,13 @@
3434
import org.elasticsearch.index.query.QueryBuilders;
3535
import org.elasticsearch.search.suggest.SuggestBuilder;
3636
import org.springframework.data.elasticsearch.BulkFailureException;
37-
import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
37+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
38+
import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder;
39+
import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
40+
import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
41+
import org.springframework.data.elasticsearch.core.SearchHits;
3842
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
3943
import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
40-
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
4144
import org.springframework.data.elasticsearch.core.query.Query;
4245
import org.springframework.util.Assert;
4346

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.clients.elasticsearch7;
1717

1818
import static org.springframework.data.elasticsearch.core.query.Criteria.*;
1919

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.clients.elasticsearch7;
1717

1818
import static org.elasticsearch.index.query.Operator.*;
1919
import static org.elasticsearch.index.query.QueryBuilders.*;

Diff for: ‎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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core.clients.elasticsearch7;
16+
package org.springframework.data.elasticsearch.clients.elasticsearch7;
1717

1818
import org.elasticsearch.search.aggregations.Aggregation;
1919
import org.springframework.data.elasticsearch.core.AggregationContainer;

Diff for: ‎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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core.clients.elasticsearch7;
16+
package org.springframework.data.elasticsearch.clients.elasticsearch7;
1717

1818
import org.elasticsearch.search.aggregations.Aggregations;
1919
import org.springframework.data.elasticsearch.core.AggregationsContainer;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslator.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import java.io.IOException;
1919
import java.util.List;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java

+14-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import java.io.IOException;
1919
import java.util.List;
@@ -45,18 +45,27 @@
4545
import org.elasticsearch.search.suggest.SuggestBuilder;
4646
import org.slf4j.Logger;
4747
import org.slf4j.LoggerFactory;
48+
import org.springframework.data.elasticsearch.backend.elasticsearch7.cluster.ElasticsearchClusterOperations;
49+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters;
50+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
51+
import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
52+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
53+
import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
54+
import org.springframework.data.elasticsearch.core.IndexOperations;
55+
import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
56+
import org.springframework.data.elasticsearch.core.MultiGetItem;
57+
import org.springframework.data.elasticsearch.core.RefreshPolicy;
58+
import org.springframework.data.elasticsearch.core.SearchHits;
59+
import org.springframework.data.elasticsearch.core.SearchScrollHits;
4860
import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
4961
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
50-
import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
51-
import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
5262
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
5363
import org.springframework.data.elasticsearch.core.query.BulkOptions;
5464
import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
5565
import org.springframework.data.elasticsearch.core.query.IndexQuery;
5666
import org.springframework.data.elasticsearch.core.query.Query;
5767
import org.springframework.data.elasticsearch.core.query.UpdateQuery;
5868
import org.springframework.data.elasticsearch.core.query.UpdateResponse;
59-
import org.springframework.data.elasticsearch.support.SearchHitsUtil;
6069
import org.springframework.lang.Nullable;
6170
import org.springframework.util.Assert;
6271

@@ -147,7 +156,7 @@ public IndexOperations indexOps(IndexCoordinates index) {
147156
// region ClusterOperations
148157
@Override
149158
public ClusterOperations cluster() {
150-
return ClusterOperations.forTemplate(this);
159+
return ElasticsearchClusterOperations.forTemplate(this);
151160
}
152161
// endregion
153162

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchTemplate.java

+14-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import java.util.ArrayList;
1919
import java.util.Collection;
@@ -46,18 +46,27 @@
4646
import org.elasticsearch.search.suggest.SuggestBuilder;
4747
import org.slf4j.Logger;
4848
import org.slf4j.LoggerFactory;
49+
import org.springframework.data.elasticsearch.backend.elasticsearch7.cluster.ElasticsearchClusterOperations;
50+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters;
51+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
52+
import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
53+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
54+
import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
55+
import org.springframework.data.elasticsearch.core.IndexOperations;
56+
import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
57+
import org.springframework.data.elasticsearch.core.MultiGetItem;
58+
import org.springframework.data.elasticsearch.core.RefreshPolicy;
59+
import org.springframework.data.elasticsearch.core.SearchHits;
60+
import org.springframework.data.elasticsearch.core.SearchScrollHits;
4961
import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
5062
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
51-
import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
52-
import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
5363
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
5464
import org.springframework.data.elasticsearch.core.query.BulkOptions;
5565
import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
5666
import org.springframework.data.elasticsearch.core.query.IndexQuery;
5767
import org.springframework.data.elasticsearch.core.query.Query;
5868
import org.springframework.data.elasticsearch.core.query.UpdateQuery;
5969
import org.springframework.data.elasticsearch.core.query.UpdateResponse;
60-
import org.springframework.data.elasticsearch.support.SearchHitsUtil;
6170
import org.springframework.lang.Nullable;
6271
import org.springframework.util.Assert;
6372

@@ -151,7 +160,7 @@ public IndexOperations indexOps(IndexCoordinates index) {
151160
// region ClusterOperations
152161
@Override
153162
public ClusterOperations cluster() {
154-
return ClusterOperations.forTemplate(this);
163+
return ElasticsearchClusterOperations.forTemplate(this);
155164
}
156165
// endregion
157166

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import reactor.core.publisher.Flux;
1919
import reactor.core.publisher.Mono;
@@ -56,17 +56,21 @@
5656
import org.springframework.data.elasticsearch.BulkFailureException;
5757
import org.springframework.data.elasticsearch.NoSuchIndexException;
5858
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
59-
import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
59+
import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient;
60+
import org.springframework.data.elasticsearch.backend.elasticsearch7.cluster.DefaultReactiveClusterOperations;
61+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters;
62+
import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse;
63+
import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder;
64+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ElasticsearchAggregation;
65+
import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
66+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
67+
import org.springframework.data.elasticsearch.core.*;
6068
import org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity;
61-
import org.springframework.data.elasticsearch.core.clients.elasticsearch7.ElasticsearchAggregation;
62-
import org.springframework.data.elasticsearch.core.cluster.DefaultReactiveClusterOperations;
6369
import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
6470
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
6571
import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
6672
import org.springframework.data.elasticsearch.core.document.Document;
67-
import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
6873
import org.springframework.data.elasticsearch.core.document.SearchDocument;
69-
import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
7074
import org.springframework.data.elasticsearch.core.event.ReactiveAfterConvertCallback;
7175
import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback;
7276
import org.springframework.data.elasticsearch.core.event.ReactiveBeforeConvertCallback;
@@ -77,7 +81,6 @@
7781
import org.springframework.data.elasticsearch.core.query.BulkOptions;
7882
import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
7983
import org.springframework.data.elasticsearch.core.query.IndexQuery;
80-
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
8184
import org.springframework.data.elasticsearch.core.query.Query;
8285
import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
8386
import org.springframework.data.elasticsearch.core.query.UpdateQuery;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import static org.elasticsearch.client.Requests.*;
1919
import static org.springframework.util.StringUtils.*;
@@ -42,6 +42,12 @@
4242
import org.springframework.dao.InvalidDataAccessApiUsageException;
4343
import org.springframework.data.elasticsearch.NoSuchIndexException;
4444
import org.springframework.data.elasticsearch.annotations.Mapping;
45+
import org.springframework.data.elasticsearch.clients.elasticsearch7.RequestFactory;
46+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
47+
import org.springframework.data.elasticsearch.core.IndexInformation;
48+
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
49+
import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
50+
import org.springframework.data.elasticsearch.core.ReactiveResourceUtil;
4551
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
4652
import org.springframework.data.elasticsearch.core.document.Document;
4753
import org.springframework.data.elasticsearch.core.index.AliasActions;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.clients.elasticsearch7;
1717

1818
import static org.elasticsearch.index.query.QueryBuilders.*;
1919
import static org.springframework.util.CollectionUtils.*;
@@ -97,6 +97,11 @@
9797
import org.elasticsearch.search.suggest.SuggestBuilder;
9898
import org.springframework.dao.InvalidDataAccessApiUsageException;
9999
import org.springframework.data.domain.Sort;
100+
import org.springframework.data.elasticsearch.backend.elasticsearch7.query.HighlightQueryBuilder;
101+
import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery;
102+
import org.springframework.data.elasticsearch.backend.elasticsearch7.query.ScriptField;
103+
import org.springframework.data.elasticsearch.core.RefreshPolicy;
104+
import org.springframework.data.elasticsearch.core.ScriptType;
100105
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
101106
import org.springframework.data.elasticsearch.core.document.Document;
102107
import org.springframework.data.elasticsearch.core.index.AliasAction;
@@ -127,10 +132,11 @@
127132
* @author Peer Mueller
128133
* @since 4.0
129134
*/
130-
class RequestFactory {
135+
// todo make package private again after refactoring
136+
public class RequestFactory {
131137

132138
// the default max result window size of Elasticsearch
133-
static final Integer INDEX_MAX_RESULT_WINDOW = 10_000;
139+
public static final Integer INDEX_MAX_RESULT_WINDOW = 10_000;
134140

135141
private final ElasticsearchConverter elasticsearchConverter;
136142

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/ResponseConverter.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.data.elasticsearch.core;
17+
package org.springframework.data.elasticsearch.clients.elasticsearch7;
1818

1919
import java.util.ArrayList;
2020
import java.util.Collections;
@@ -40,6 +40,8 @@
4040
import org.elasticsearch.common.compress.CompressedXContent;
4141
import org.elasticsearch.index.reindex.BulkByScrollResponse;
4242
import org.elasticsearch.index.reindex.ScrollableHitSource;
43+
import org.springframework.data.elasticsearch.core.IndexInformation;
44+
import org.springframework.data.elasticsearch.core.MultiGetItem;
4345
import org.springframework.data.elasticsearch.core.cluster.ClusterHealth;
4446
import org.springframework.data.elasticsearch.core.document.Document;
4547
import org.springframework.data.elasticsearch.core.index.AliasData;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import java.util.Collections;
1919
import java.util.List;
@@ -40,6 +40,10 @@
4040
import org.elasticsearch.cluster.metadata.MappingMetadata;
4141
import org.slf4j.Logger;
4242
import org.slf4j.LoggerFactory;
43+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
44+
import org.springframework.data.elasticsearch.core.AbstractIndexTemplate;
45+
import org.springframework.data.elasticsearch.core.IndexInformation;
46+
import org.springframework.data.elasticsearch.core.IndexOperations;
4347
import org.springframework.data.elasticsearch.core.document.Document;
4448
import org.springframework.data.elasticsearch.core.index.AliasActions;
4549
import org.springframework.data.elasticsearch.core.index.AliasData;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/support/SearchHitsUtil.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.support;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import org.elasticsearch.search.SearchHits;
1919

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/TransportIndexTemplate.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/TransportIndexTemplate.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.core;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7;
1717

1818
import java.util.Collections;
1919
import java.util.HashSet;
@@ -47,6 +47,10 @@
4747
import org.elasticsearch.common.compress.CompressedXContent;
4848
import org.slf4j.Logger;
4949
import org.slf4j.LoggerFactory;
50+
import org.springframework.data.elasticsearch.clients.elasticsearch7.ResponseConverter;
51+
import org.springframework.data.elasticsearch.core.AbstractIndexTemplate;
52+
import org.springframework.data.elasticsearch.core.IndexInformation;
53+
import org.springframework.data.elasticsearch.core.IndexOperations;
5054
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
5155
import org.springframework.data.elasticsearch.core.document.Document;
5256
import org.springframework.data.elasticsearch.core.index.AliasActions;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/client/ClusterNodes.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/ClusterNodes.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.client;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7.client;
1717

1818
import java.net.InetAddress;
1919
import java.net.UnknownHostException;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/client/RestClientFactoryBean.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.client;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7.client;
1717

1818
import java.net.URL;
1919
import java.util.ArrayList;

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/client/RestClients.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.data.elasticsearch.client;
16+
package org.springframework.data.elasticsearch.backend.elasticsearch7.client;
1717

1818
import java.io.ByteArrayOutputStream;
1919
import java.io.Closeable;
@@ -43,6 +43,8 @@
4343
import org.elasticsearch.client.RestClient;
4444
import org.elasticsearch.client.RestClientBuilder;
4545
import org.elasticsearch.client.RestHighLevelClient;
46+
import org.springframework.data.elasticsearch.client.ClientConfiguration;
47+
import org.springframework.data.elasticsearch.client.ClientLogger;
4648
import org.springframework.http.HttpHeaders;
4749
import org.springframework.http.HttpStatus;
4850
import org.springframework.util.Assert;

0 commit comments

Comments
 (0)