diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 075273094..db5556b77 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -34,7 +34,7 @@ The following table shows the Elasticsearch versions that are used by Spring Dat [cols="^,^,^,^,^",options="header"] |=== | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot -| 2022.0 (Raj) | 4.4.x | 7.16.2 | 5.3.x | +| 2022.0 (Raj) | 4.4.x | 7.16.2 | 5.3.x | 2.7.x | 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x | 2021.0 (Pascal) | 4.2.x | 7.12.0 | 5.3.x | 2.5.x | 2020.0 (Ockham)footnote:oom[Out of maintenance] | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x diff --git a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc index 08dbc6ba1..325e9c845 100644 --- a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc +++ b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc @@ -9,10 +9,6 @@ This section describes breaking changes from version 4.3.x to 4.4.x and how remo [[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`. - === Removal of deprecated classes ==== `ElasticsearchTemplate` has been removed diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/package-info.java deleted file mode 100644 index e5cc8e897..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.client; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/package-info.java deleted file mode 100644 index 79232e89a..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/package-info.java deleted file mode 100644 index 74805f4f5..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.util; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/package-info.java deleted file mode 100644 index 3d46034e5..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Interfaces and classes related to Elasticsearch cluster information and management. - */ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.cluster; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/package-info.java deleted file mode 100644 index 88f2d84d1..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.config; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/package-info.java deleted file mode 100644 index b80aa6d1f..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.document; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/package-info.java deleted file mode 100644 index 6e4e0ddb4..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2021-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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 - * - * 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. - */ - -/** - * Classes and interfaces used by the code that uses Elasticsearch 7 client libraries - */ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/package-info.java deleted file mode 100644 index ea6401d0a..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.query; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/package-info.java b/src/main/java/org/springframework/data/elasticsearch/backend/package-info.java deleted file mode 100644 index 5430049ac..000000000 --- a/src/main/java/org/springframework/data/elasticsearch/backend/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2021-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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 - * - * 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. - */ - -/** - * This is the base package for the code that uses backend specific classes and libraries, for example Elasticsearch 7 - * or OpenSearch. - */ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend; diff --git a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java index c3e343777..4505352aa 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java @@ -27,7 +27,6 @@ import javax.net.ssl.SSLContext; import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClients; import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; import org.springframework.http.HttpHeaders; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java index 6d6e2cefa..c9bf2288c 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java @@ -28,7 +28,6 @@ import javax.net.ssl.SSLContext; import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClients; import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint; import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder; import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder; @@ -48,7 +47,7 @@ * @author Henrique Amaral * @since 3.2 */ -public class ClientConfigurationBuilder +class ClientConfigurationBuilder implements ClientConfigurationBuilderWithRequiredEndpoint, MaybeSecureClientConfigurationBuilder { private final List hosts = new ArrayList<>(); diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java b/src/main/java/org/springframework/data/elasticsearch/client/RestClientFactoryBean.java similarity index 96% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java rename to src/main/java/org/springframework/data/elasticsearch/client/RestClientFactoryBean.java index 5480707e2..8ef4efc7b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/RestClientFactoryBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client; +package org.springframework.data.elasticsearch.client; import java.net.URL; import java.util.ArrayList; @@ -35,7 +35,6 @@ * * @author Don Wellington * @author Peter-Josef Meisch - * @since 4.4 */ public class RestClientFactoryBean implements FactoryBean, InitializingBean, DisposableBean { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java b/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java rename to src/main/java/org/springframework/data/elasticsearch/client/RestClients.java index 9f645dbc9..866822943 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/RestClients.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client; +package org.springframework.data.elasticsearch.client; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -43,8 +43,6 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.client.RestHighLevelClient; -import org.springframework.data.elasticsearch.client.ClientConfiguration; -import org.springframework.data.elasticsearch.client.ClientLogger; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.util.Assert; @@ -59,7 +57,7 @@ * @author Henrique Amaral * @author Peter-Josef Meisch * @author Nic Hines - * @since 4.4 + * @since 3.2 */ public final class RestClients { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java rename to src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java index 906743862..001e44b1c 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import io.netty.channel.ChannelOption; import io.netty.handler.ssl.ApplicationProtocolConfig; @@ -103,19 +103,15 @@ import org.reactivestreams.Publisher; import org.springframework.data.elasticsearch.RestStatusException; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ResponseConverter; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient.Cluster; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient.Indices; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.util.NamedXContents; +import org.springframework.data.elasticsearch.core.ResponseConverter; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.data.elasticsearch.client.ClientLogger; import org.springframework.data.elasticsearch.client.ElasticsearchHost; import org.springframework.data.elasticsearch.client.NoReachableHostException; -import org.springframework.data.elasticsearch.client.reactive.HostProvider; import org.springframework.data.elasticsearch.client.reactive.HostProvider.Verification; -import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; -import org.springframework.data.elasticsearch.client.reactive.RequestBodyEncodingException; -import org.springframework.data.elasticsearch.client.reactive.WebClientProvider; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Cluster; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Indices; +import org.springframework.data.elasticsearch.client.util.NamedXContents; import org.springframework.data.elasticsearch.client.util.ScrollState; import org.springframework.data.elasticsearch.core.query.ByQueryResponse; import org.springframework.data.util.Lazy; @@ -147,7 +143,7 @@ * @author Brian Clozel * @author Farid Faoudi * @author George Popides - * @since 4.4 + * @since 3.2 * @see ClientConfiguration * @see ReactiveRestClients */ @@ -976,7 +972,7 @@ static class ClientStatus implements Status { /* * (non-Javadoc) - * @see org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient.Status#hosts() + * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Status#hosts() */ @Override public Collection hosts() { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultRequestCreator.java similarity index 87% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java rename to src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultRequestCreator.java index 4c6bf5a9c..036679b03 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultRequestCreator.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; /** * @author Roman Puchkovskiy - * @since 4.4 + * @since 4.0 */ class DefaultRequestCreator implements RequestCreator {} diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java similarity index 89% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java rename to src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java index feabf60a3..e24ba8f5b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import reactor.core.publisher.Mono; @@ -32,10 +32,9 @@ * @author Christoph Strobl * @author Peter-Josef Meisch * @author Mark Paluch - * @since 4.4 + * @since 3.2 */ -// todo make package private again after refactoring? -public class RawActionResponse extends ActionResponse { +class RawActionResponse extends ActionResponse { private final ClientResponse delegate; @@ -43,7 +42,7 @@ private RawActionResponse(ClientResponse delegate) { this.delegate = delegate; } - public static RawActionResponse create(ClientResponse response) { + static RawActionResponse create(ClientResponse response) { return new RawActionResponse(response); } diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java similarity index 99% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java rename to src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java index c1ce1949b..030243851 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -60,7 +60,6 @@ import org.elasticsearch.search.suggest.Suggest; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.data.elasticsearch.client.ElasticsearchHost; -import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; import org.springframework.data.elasticsearch.core.query.ByQueryResponse; import org.springframework.http.HttpHeaders; import org.springframework.util.Assert; @@ -77,7 +76,7 @@ * @author Henrique Amaral * @author Thomas Geese * @author Farid Faoudi - * @since 4.4 + * @since 3.2 * @see ClientConfiguration * @see ReactiveRestClients */ diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveRestClients.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveRestClients.java index 468009eb1..0a2880753 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveRestClients.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveRestClients.java @@ -17,9 +17,6 @@ import java.util.function.Function; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.DefaultReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.RequestCreator; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.util.Assert; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java rename to src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java index 393704154..34fb05016 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import java.io.IOException; import java.util.function.Function; @@ -52,13 +52,13 @@ import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.elasticsearch.script.mustache.SearchTemplateRequest; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.util.RequestConverters; +import org.springframework.data.elasticsearch.client.util.RequestConverters; /** * @author Roman Puchkovskiy * @author Farid Faoudi * @author George Popides - * @since 4.4 + * @since 4.0 */ public interface RequestCreator { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java b/src/main/java/org/springframework/data/elasticsearch/client/util/NamedXContents.java similarity index 98% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java rename to src/main/java/org/springframework/data/elasticsearch/client/util/NamedXContents.java index a3d6903ac..5d3d125f3 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/util/NamedXContents.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.util; +package org.springframework.data.elasticsearch.client.util; import java.util.HashMap; import java.util.List; @@ -78,7 +78,7 @@ import org.elasticsearch.xcontent.ContextParser; import org.elasticsearch.xcontent.NamedXContentRegistry; import org.elasticsearch.xcontent.ParseField; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; /** *

@@ -91,7 +91,7 @@ * Only intended for internal use. * * @author Russell Parry - * @since 4.4 + * @since 4.0 */ public class NamedXContents { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java b/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java similarity index 99% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java rename to src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java index 871a3a032..6d5ad016d 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.util; +package org.springframework.data.elasticsearch.client.util; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -101,7 +101,7 @@ import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentParser; import org.elasticsearch.xcontent.XContentType; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.http.HttpMethod; import org.springframework.lang.Nullable; @@ -119,7 +119,7 @@ * @author Christoph Strobl * @author Peter-Josef Meisch * @author Farid Faoudi - * @since 4.4 + * @since 3.2 */ @SuppressWarnings("JavadocReference") public class RequestConverters { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java similarity index 86% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java rename to src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java index 44accc2d1..82caab490 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.config; +package org.springframework.data.elasticsearch.config; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.context.annotation.Bean; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; /** * @author Christoph Strobl * @author Peter-Josef Meisch - * @since 4.4 + * @since 3.2 * @see ElasticsearchConfigurationSupport */ public abstract class AbstractElasticsearchConfiguration extends ElasticsearchConfigurationSupport { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/config/AbstractReactiveElasticsearchConfiguration.java similarity index 86% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java rename to src/main/java/org/springframework/data/elasticsearch/config/AbstractReactiveElasticsearchConfiguration.java index 55d9a485a..50baf8a44 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/config/AbstractReactiveElasticsearchConfiguration.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.config; +package org.springframework.data.elasticsearch.config; import org.elasticsearch.action.support.IndicesOptions; import org.springframework.context.annotation.Bean; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; +import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate; import org.springframework.data.elasticsearch.core.RefreshPolicy; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.lang.Nullable; @@ -28,7 +27,7 @@ /** * @author Christoph Strobl * @author Peter-Josef Meisch - * @since 4.4 + * @since 3.2 * @see ElasticsearchConfigurationSupport */ public abstract class AbstractReactiveElasticsearchConfiguration extends ElasticsearchConfigurationSupport { diff --git a/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java b/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java index 0e0462a75..8356df3c9 100644 --- a/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java +++ b/src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java @@ -27,7 +27,6 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.backend.elasticsearch7.config.AbstractReactiveElasticsearchConfiguration; import org.springframework.data.elasticsearch.core.RefreshPolicy; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions; diff --git a/src/main/java/org/springframework/data/elasticsearch/config/RestClientBeanDefinitionParser.java b/src/main/java/org/springframework/data/elasticsearch/config/RestClientBeanDefinitionParser.java index 59df8ce7e..f4f8548fd 100644 --- a/src/main/java/org/springframework/data/elasticsearch/config/RestClientBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/elasticsearch/config/RestClientBeanDefinitionParser.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClientFactoryBean; +import org.springframework.data.elasticsearch.client.RestClientFactoryBean; import org.w3c.dom.Element; /** diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java index 6c25afd70..aa825b3b1 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java @@ -27,8 +27,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.data.convert.EntityReader; -import org.springframework.data.elasticsearch.backend.elasticsearch7.RequestFactory; -import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse; +import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java index 918b801e2..8095ddf06 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java @@ -25,7 +25,6 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; import org.springframework.data.elasticsearch.annotations.Mapping; -import org.springframework.data.elasticsearch.backend.elasticsearch7.RequestFactory; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasData; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java similarity index 99% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java rename to src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java index fdfc3f2a0..98e78669e 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.springframework.data.elasticsearch.core.query.Criteria.*; @@ -47,7 +47,6 @@ * @author Mohsin Husen * @author Artur Konczak * @author Peter-Josef Meisch - * @since 4.4 */ class CriteriaFilterProcessor { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java similarity index 99% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java rename to src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java index 616f080ec..49a5594a6 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/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.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.elasticsearch.index.query.Operator.*; import static org.elasticsearch.index.query.QueryBuilders.*; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchAggregation.java similarity index 87% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java rename to src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchAggregation.java index 1c430362e..3880c33ff 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchAggregation.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import org.elasticsearch.search.aggregations.Aggregation; -import org.springframework.data.elasticsearch.core.AggregationContainer; import org.springframework.lang.NonNull; /** * AggregationContainer implementation for an Elasticsearch7 aggregation. * * @author Peter-Josef Meisch - * @since 4.4 + * @since 4.3 */ public class ElasticsearchAggregation implements AggregationContainer { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchAggregations.java similarity index 87% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java rename to src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchAggregations.java index a84b9f8c9..cef6370f3 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchAggregations.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import org.elasticsearch.search.aggregations.Aggregations; -import org.springframework.data.elasticsearch.core.AggregationsContainer; import org.springframework.lang.NonNull; /** * AggregationsContainer implementation for the Elasticsearch7 aggregations. * * @author Peter-Josef Meisch - * @since 4.4 + * @since 4.3 */ public class ElasticsearchAggregations implements AggregationsContainer { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslator.java similarity index 98% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java rename to src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslator.java index 548328de4..ff82f7015 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/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.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import java.io.IOException; import java.util.List; @@ -43,7 +43,7 @@ * @author Peter-Josef Meisch * @author Roman Puchkovskiy * @author Mark Paluch - * @since 4.4 + * @since 3.2 */ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java similarity index 95% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java rename to src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java index d5c210561..84277ce34 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/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.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import java.io.IOException; import java.util.ArrayList; @@ -57,24 +57,17 @@ import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.suggest.SuggestBuilder; import org.springframework.data.elasticsearch.BulkFailureException; -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.backend.elasticsearch7.query.NativeSearchQueryBuilder; -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.cluster.ElasticsearchClusterOperations; 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.MoreLikeThisQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.query.UpdateQuery; import org.springframework.data.elasticsearch.core.query.UpdateResponse; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchOperations.java index 63c8db8a9..0dfcc5abe 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchOperations.java @@ -16,8 +16,7 @@ package org.springframework.data.elasticsearch.core; import org.reactivestreams.Publisher; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java similarity index 98% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java rename to src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java index c706f3675..387f6d3fa 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/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.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -56,18 +56,16 @@ import org.springframework.data.elasticsearch.BulkFailureException; import org.springframework.data.elasticsearch.NoSuchIndexException; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; -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.core.*; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity; +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.ReactiveAfterLoadCallback; import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback; @@ -79,6 +77,7 @@ 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; @@ -106,7 +105,7 @@ * @author Russell Parry * @author Thomas Geese * @author Farid Faoudi - * @since 4.4 + * @since 3.2 */ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations, ApplicationContextAware { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java rename to src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java index 2739fec01..ef95f5cf9 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.elasticsearch.client.Requests.*; import static org.springframework.util.StringUtils.*; @@ -42,10 +42,6 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.elasticsearch.NoSuchIndexException; import org.springframework.data.elasticsearch.annotations.Mapping; -import org.springframework.data.elasticsearch.core.IndexInformation; -import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; -import org.springframework.data.elasticsearch.core.ReactiveIndexOperations; -import org.springframework.data.elasticsearch.core.ReactiveResourceUtil; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasActions; @@ -65,7 +61,7 @@ /** * @author Peter-Josef Meisch * @author George Popides - * @since 4.4 + * @since 4.1 */ class ReactiveIndexTemplate implements ReactiveIndexOperations { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveSearchOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveSearchOperations.java index 93b9bd93e..c68329e70 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveSearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveSearchOperations.java @@ -22,7 +22,7 @@ import org.elasticsearch.search.suggest.SuggestBuilder; import org.springframework.data.domain.Pageable; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.suggest.response.Suggest; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java b/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java similarity index 98% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java rename to src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java index 63b8f4592..d7f340d41 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.springframework.util.CollectionUtils.*; @@ -83,11 +83,6 @@ import org.elasticsearch.search.suggest.SuggestBuilder; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.domain.Sort; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.HighlightQueryBuilder; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.ScriptField; -import org.springframework.data.elasticsearch.core.RefreshPolicy; -import org.springframework.data.elasticsearch.core.ScriptType; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasAction; @@ -116,14 +111,12 @@ * @author Subhobrata Dey * @author Farid Faoudi * @author Peer Mueller - * @author vdisk - * @since 4.4 + * @since 4.0 */ -// todo make package private again after refactoring -public class RequestFactory { +class RequestFactory { // the default max result window size of Elasticsearch - public static final Integer INDEX_MAX_RESULT_WINDOW = 10_000; + static final Integer INDEX_MAX_RESULT_WINDOW = 10_000; private final ElasticsearchConverter elasticsearchConverter; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java b/src/main/java/org/springframework/data/elasticsearch/core/ResponseConverter.java similarity index 98% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java rename to src/main/java/org/springframework/data/elasticsearch/core/ResponseConverter.java index 7e964fc6a..8f9d7928e 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ResponseConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import java.util.ArrayList; import java.util.Collections; @@ -40,8 +40,6 @@ import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ScrollableHitSource; -import org.springframework.data.elasticsearch.core.IndexInformation; -import org.springframework.data.elasticsearch.core.MultiGetItem; import org.springframework.data.elasticsearch.core.cluster.ClusterHealth; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasData; @@ -56,7 +54,7 @@ * * @author George Popides * @author Peter-Josef Meisch - * @since 4.4 + * @since 4.2 */ public class ResponseConverter { private ResponseConverter() {} diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java rename to src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java index 661a570e3..111c42ea8 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import java.util.Collections; import java.util.List; @@ -40,9 +40,6 @@ import org.elasticsearch.client.indices.PutIndexTemplateRequest; import org.elasticsearch.client.indices.PutMappingRequest; import org.elasticsearch.cluster.metadata.MappingMetadata; -import org.springframework.data.elasticsearch.core.AbstractIndexTemplate; -import org.springframework.data.elasticsearch.core.IndexInformation; -import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.index.AliasActions; import org.springframework.data.elasticsearch.core.index.AliasData; @@ -62,7 +59,7 @@ * @author Peter-Josef Meisch * @author Sascha Woo * @author George Popides - * @since 4.4 + * @since 4.0 */ class RestIndexTemplate extends AbstractIndexTemplate implements IndexOperations { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java index 6973e2bb7..c17ef5213 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; -import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse; +import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.document.NestedMetaData; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitsUtil.java similarity index 93% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java rename to src/main/java/org/springframework/data/elasticsearch/core/SearchHitsUtil.java index 16df6bf2f..0c456596f 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitsUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import org.elasticsearch.search.SearchHits; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java index 895121a9a..635485606 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java @@ -19,7 +19,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.suggest.SuggestBuilder; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery; import org.springframework.data.elasticsearch.core.query.Query; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/cluster/DefaultClusterOperations.java similarity index 77% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java rename to src/main/java/org/springframework/data/elasticsearch/core/cluster/DefaultClusterOperations.java index 69b8fd1da..f1a524be4 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/cluster/DefaultClusterOperations.java @@ -13,21 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.cluster; +package org.springframework.data.elasticsearch.core.cluster; import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.client.RequestOptions; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ResponseConverter; -import org.springframework.data.elasticsearch.core.cluster.ClusterHealth; -import org.springframework.data.elasticsearch.core.cluster.ClusterOperations; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; +import org.springframework.data.elasticsearch.core.ResponseConverter; /** * Default implementation of {@link ClusterOperations} using the {@link ElasticsearchRestTemplate}. * * @author Peter-Josef Meisch - * @since 4.4 + * @since 4.2 */ class DefaultClusterOperations implements ClusterOperations { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/cluster/DefaultReactiveClusterOperations.java similarity index 80% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java rename to src/main/java/org/springframework/data/elasticsearch/core/cluster/DefaultReactiveClusterOperations.java index 946f5e641..e239fdbf4 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/cluster/DefaultReactiveClusterOperations.java @@ -13,21 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.cluster; +package org.springframework.data.elasticsearch.core.cluster; import reactor.core.publisher.Mono; import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ResponseConverter; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; -import org.springframework.data.elasticsearch.core.cluster.ClusterHealth; -import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations; +import org.springframework.data.elasticsearch.core.ResponseConverter; /** * Default implementation of {@link ReactiveClusterOperations} using the {@link ReactiveElasticsearchOperations}. * * @author Peter-Josef Meisch - * @since 4.4 + * @since 4.2 */ public class DefaultReactiveClusterOperations implements ReactiveClusterOperations { private final ReactiveElasticsearchOperations operations; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/cluster/ElasticsearchClusterOperations.java similarity index 81% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java rename to src/main/java/org/springframework/data/elasticsearch/core/cluster/ElasticsearchClusterOperations.java index b9bfadf0e..ab3bb1c6a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/cluster/ElasticsearchClusterOperations.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.cluster; +package org.springframework.data.elasticsearch.core.cluster; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.core.cluster.ClusterOperations; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java b/src/main/java/org/springframework/data/elasticsearch/core/document/DocumentAdapters.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java rename to src/main/java/org/springframework/data/elasticsearch/core/document/DocumentAdapters.java index af50ce6b8..dca121a16 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/document/DocumentAdapters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.document; +package org.springframework.data.elasticsearch.core.document; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -39,12 +39,8 @@ import org.elasticsearch.index.get.GetResult; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ResponseConverter; import org.springframework.data.elasticsearch.core.MultiGetItem; -import org.springframework.data.elasticsearch.core.document.Document; -import org.springframework.data.elasticsearch.core.document.Explanation; -import org.springframework.data.elasticsearch.core.document.NestedMetaData; -import org.springframework.data.elasticsearch.core.document.SearchDocument; +import org.springframework.data.elasticsearch.core.ResponseConverter; import org.springframework.data.mapping.MappingException; import org.springframework.lang.Nullable; import org.springframework.util.Assert; @@ -64,7 +60,7 @@ * @author Peter-Josef Meisch * @author Roman Puchkovskiy * @author Matt Gilene - * @since 4.4 + * @since 4.0 */ public final class DocumentAdapters { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocument.java b/src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocument.java index b6d23ec95..d3a20a1b8 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocument.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocument.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; -import org.springframework.data.elasticsearch.backend.elasticsearch7.document.SearchDocumentResponse; import org.springframework.lang.Nullable; /** diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java b/src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocumentResponse.java similarity index 97% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java rename to src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocumentResponse.java index 5265678e7..abced006b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocumentResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.document; +package org.springframework.data.elasticsearch.core.document; import java.util.ArrayList; import java.util.List; @@ -25,9 +25,8 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.aggregations.Aggregations; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchAggregations; import org.springframework.data.elasticsearch.core.AggregationsContainer; -import org.springframework.data.elasticsearch.core.document.SearchDocument; +import org.springframework.data.elasticsearch.core.ElasticsearchAggregations; import org.springframework.data.elasticsearch.core.suggest.response.CompletionSuggestion; import org.springframework.data.elasticsearch.core.suggest.response.PhraseSuggestion; import org.springframework.data.elasticsearch.core.suggest.response.SortBy; @@ -42,7 +41,7 @@ * created with the {@link #from(SearchResponse,Function)} method. * * @author Peter-Josef Meisch - * @since 4.4 + * @since 4.0 */ public class SearchDocumentResponse { diff --git a/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java index 2d34906a8..8e2e0508a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java @@ -32,7 +32,7 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.data.annotation.Transient; import org.springframework.data.elasticsearch.annotations.*; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.core.ResourceUtil; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.convert.ElasticsearchTypeMapper; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilder.java similarity index 98% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java rename to src/main/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilder.java index 4c9a5c3ef..ba2607ecd 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.query; +package org.springframework.data.elasticsearch.core.query; import java.util.Arrays; import java.util.stream.Collectors; @@ -35,7 +35,6 @@ * Converts the {@link Highlight} annotation from a method to an Elasticsearch {@link HighlightBuilder}. * * @author Peter-Josef Meisch - * @since 4.4 */ public class HighlightQueryBuilder { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java similarity index 96% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java rename to src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java index 41d5ecae7..593fb6c5e 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.query; +package org.springframework.data.elasticsearch.core.query; import java.util.ArrayList; import java.util.Arrays; @@ -27,8 +27,6 @@ import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.suggest.SuggestBuilder; -import org.springframework.data.elasticsearch.core.query.BaseQuery; -import org.springframework.data.elasticsearch.core.query.IndexBoost; import org.springframework.lang.Nullable; /** @@ -43,7 +41,6 @@ * @author Jean-Baptiste Nizet * @author Martin Choraine * @author Peter-Josef Meisch - * @since 4.4 */ public class NativeSearchQuery extends BaseQuery { diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java similarity index 96% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java rename to src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java index e626b489b..19e62236f 100755 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.query; +package org.springframework.data.elasticsearch.core.query; import static org.springframework.util.CollectionUtils.*; @@ -33,11 +33,6 @@ import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.suggest.SuggestBuilder; import org.springframework.data.domain.Pageable; -import org.springframework.data.elasticsearch.core.query.IndexBoost; -import org.springframework.data.elasticsearch.core.query.IndicesOptions; -import org.springframework.data.elasticsearch.core.query.Query; -import org.springframework.data.elasticsearch.core.query.RescorerQuery; -import org.springframework.data.elasticsearch.core.query.SourceFilter; import org.springframework.lang.Nullable; /** @@ -55,7 +50,6 @@ * @author Peter-Josef Meisch * @author Peer Mueller * @author vdisk - * @since 4.4 */ public class NativeSearchQueryBuilder { @@ -106,11 +100,17 @@ public NativeSearchQueryBuilder withSort(SortBuilder sortBuilder) { return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withSorts(Collection> sortBuilders) { this.sortBuilders.addAll(sortBuilders); return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withSorts(SortBuilder... sortBuilders) { Collections.addAll(this.sortBuilders, sortBuilders); return this; @@ -126,6 +126,9 @@ public NativeSearchQueryBuilder withCollapseField(String collapseField) { return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withCollapseBuilder(@Nullable CollapseBuilder collapseBuilder) { this.collapseBuilder = collapseBuilder; return this; @@ -140,11 +143,17 @@ public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder agg return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withAggregations(Collection> aggregationBuilders) { this.aggregationBuilders.addAll(aggregationBuilders); return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withAggregations(AbstractAggregationBuilder... aggregationBuilders) { Collections.addAll(this.aggregationBuilders, aggregationBuilders); return this; @@ -159,12 +168,18 @@ public NativeSearchQueryBuilder addAggregation(PipelineAggregationBuilder pipeli return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withPipelineAggregations( Collection pipelineAggregationBuilders) { this.pipelineAggregationBuilders.addAll(pipelineAggregationBuilders); return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withPipelineAggregations(PipelineAggregationBuilder... pipelineAggregationBuilders) { Collections.addAll(this.pipelineAggregationBuilders, pipelineAggregationBuilders); return this; @@ -180,6 +195,9 @@ public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... hi return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withHighlightFields(Collection highlightFields) { this.highlightFields.addAll(highlightFields); return this; @@ -190,6 +208,9 @@ public NativeSearchQueryBuilder withIndicesBoost(Collection indicesB return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withIndicesBoost(IndexBoost... indicesBoost) { Collections.addAll(this.indicesBoost, indicesBoost); return this; @@ -205,6 +226,9 @@ public NativeSearchQueryBuilder withPageable(Pageable pageable) { return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withFields(Collection fields) { this.fields.addAll(fields); return this; @@ -247,6 +271,7 @@ public NativeSearchQueryBuilder withMinScore(float minScore) { /** * @param trackScores whether to track scores. * @return this object + * @since 3.1 */ public NativeSearchQueryBuilder withTrackScores(boolean trackScores) { this.trackScores = trackScores; @@ -258,6 +283,9 @@ public NativeSearchQueryBuilder withIds(Collection ids) { return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withIds(String... ids) { Collections.addAll(this.ids, ids); return this; @@ -288,6 +316,9 @@ public NativeSearchQueryBuilder withMaxResults(Integer maxResults) { return this; } + /** + * @since 4.2 + */ public NativeSearchQueryBuilder withTrackTotalHits(Boolean trackTotalHits) { this.trackTotalHits = trackTotalHits; return this; @@ -303,6 +334,9 @@ public NativeSearchQueryBuilder withRescorerQuery(RescorerQuery rescorerQuery) { return this; } + /** + * @since 4.3 + */ public NativeSearchQueryBuilder withSuggestBuilder(SuggestBuilder suggestBuilder) { this.suggestBuilder = suggestBuilder; return this; diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java b/src/main/java/org/springframework/data/elasticsearch/core/query/ScriptField.java similarity index 91% rename from src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java rename to src/main/java/org/springframework/data/elasticsearch/core/query/ScriptField.java index 64378a74c..b5202dd39 100644 --- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/query/ScriptField.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.query; +package org.springframework.data.elasticsearch.core.query; import org.elasticsearch.script.Script; /** * @author Ryan Murfitt * @author Artur Konczak - * @since 4.4 */ public class ScriptField { diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java index 54fffb9d2..95ecbc9ab 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java @@ -29,8 +29,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java index 353bd9873..d642eb12b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java @@ -21,8 +21,8 @@ import org.reactivestreams.Publisher; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.MultiGetItem; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; import org.springframework.data.elasticsearch.core.ReactiveIndexOperations; diff --git a/src/test/java/org/springframework/data/elasticsearch/JUnit5SampleRestTemplateBasedTests.java b/src/test/java/org/springframework/data/elasticsearch/JUnit5SampleRestTemplateBasedTests.java index 92d9a7bd8..72bfbc7b5 100644 --- a/src/test/java/org/springframework/data/elasticsearch/JUnit5SampleRestTemplateBasedTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/JUnit5SampleRestTemplateBasedTests.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java b/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java index 7cac6b21a..c2e53d881 100644 --- a/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java @@ -40,8 +40,8 @@ import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.InnerField; import org.springframework.data.elasticsearch.annotations.MultiField; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.SearchHits; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/package-info.java b/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/package-info.java deleted file mode 100644 index 74805f4f5..000000000 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@org.springframework.lang.NonNullApi -@org.springframework.lang.NonNullFields -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.util; diff --git a/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java index 9bca63201..a6609bec5 100644 --- a/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java @@ -30,7 +30,6 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClients; import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientsTest.java b/src/test/java/org/springframework/data/elasticsearch/client/RestClientsTest.java similarity index 96% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientsTest.java rename to src/test/java/org/springframework/data/elasticsearch/client/RestClientsTest.java index bbf8eb27d..a414e9419 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientsTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/RestClientsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client; +package org.springframework.data.elasticsearch.client; import static com.github.tomakehurst.wiremock.client.WireMock.*; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; @@ -38,9 +38,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.client.ClientConfiguration; -import org.springframework.data.elasticsearch.client.ClientConfigurationBuilder; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClientTest.java b/src/test/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClientTest.java similarity index 96% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClientTest.java rename to src/test/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClientTest.java index 2c2b8b857..6a9049cf8 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClientTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import static org.assertj.core.api.Assertions.*; import static org.elasticsearch.search.internal.SearchContext.*; @@ -40,7 +40,6 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.elasticsearch.RestStatusException; -import org.springframework.data.elasticsearch.client.reactive.HostProvider; import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClientIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientIntegrationTests.java similarity index 99% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClientIntegrationTests.java rename to src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientIntegrationTests.java index f662c24f4..dc235956e 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClientUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java similarity index 98% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClientUnitTests.java rename to src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java index 3e753e985..dab6e1ea3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClientUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive; +package org.springframework.data.elasticsearch.client.reactive; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -46,8 +46,6 @@ import org.mockito.Mockito; import org.reactivestreams.Publisher; import org.springframework.data.elasticsearch.RestStatusException; -import org.springframework.data.elasticsearch.client.reactive.HostProvider; -import org.springframework.data.elasticsearch.client.reactive.ReactiveMockClientTestsUtils; import org.springframework.data.elasticsearch.client.reactive.ReactiveMockClientTestsUtils.MockDelegatingElasticsearchHostProvider; import org.springframework.data.elasticsearch.client.reactive.ReactiveMockClientTestsUtils.MockWebClientProvider.Receive; import org.springframework.http.HttpMethod; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConvertersTest.java b/src/test/java/org/springframework/data/elasticsearch/client/util/RequestConvertersTest.java similarity index 97% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConvertersTest.java rename to src/test/java/org/springframework/data/elasticsearch/client/util/RequestConvertersTest.java index 64708435c..e36a30cf0 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConvertersTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/util/RequestConvertersTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7.client.util; +package org.springframework.data.elasticsearch.client.util; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java index 6e667dacf..eadb15ccc 100644 --- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java @@ -28,11 +28,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.config.AbstractElasticsearchConfiguration; -import org.springframework.data.elasticsearch.backend.elasticsearch7.config.AbstractReactiveElasticsearchConfiguration; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; +import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext; diff --git a/src/test/java/org/springframework/data/elasticsearch/config/abstractelasticsearchconfiguration/ElasticsearchConfigurationTests.java b/src/test/java/org/springframework/data/elasticsearch/config/abstractelasticsearchconfiguration/ElasticsearchConfigurationTests.java index ced0491ff..a47c1254b 100644 --- a/src/test/java/org/springframework/data/elasticsearch/config/abstractelasticsearchconfiguration/ElasticsearchConfigurationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/config/abstractelasticsearchconfiguration/ElasticsearchConfigurationTests.java @@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.backend.elasticsearch7.config.AbstractElasticsearchConfiguration; +import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.lang.Nullable; diff --git a/src/test/java/org/springframework/data/elasticsearch/config/namespace/ElasticsearchNamespaceHandlerTests.java b/src/test/java/org/springframework/data/elasticsearch/config/namespace/ElasticsearchNamespaceHandlerTests.java index b07ef3bc9..1b82dbf1f 100644 --- a/src/test/java/org/springframework/data/elasticsearch/config/namespace/ElasticsearchNamespaceHandlerTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/config/namespace/ElasticsearchNamespaceHandlerTests.java @@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClientFactoryBean; +import org.springframework.data.elasticsearch.client.RestClientFactoryBean; import org.springframework.data.elasticsearch.junit.jupiter.Tags; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryMappingUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingUnitTests.java similarity index 99% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryMappingUnitTests.java rename to src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingUnitTests.java index 477ab4eba..3bec799f6 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryMappingUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.skyscreamer.jsonassert.JSONAssert.*; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessorUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessorUnitTests.java similarity index 99% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessorUnitTests.java rename to src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessorUnitTests.java index 1735afc9c..a4ddc072f 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessorUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.skyscreamer.jsonassert.JSONAssert.*; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java index 6ea19499c..795cdb325 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/DocumentAdaptersUnitTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.SearchShardTarget; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.data.elasticsearch.backend.elasticsearch7.document.DocumentAdapters; +import org.springframework.data.elasticsearch.core.document.DocumentAdapters; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.document.Explanation; import org.springframework.data.elasticsearch.core.document.SearchDocument; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslatorTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslatorTests.java index 5dd4b9299..8b7d44f93 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslatorTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslatorTests.java @@ -25,7 +25,6 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.OptimisticLockingFailureException; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchExceptionTranslator; /** * @author Roman Puchkovskiy diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchPartQueryTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchPartQueryTests.java index 299318b24..7944f4931 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchPartQueryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchPartQueryTests.java @@ -33,7 +33,6 @@ import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -import org.springframework.data.elasticsearch.backend.elasticsearch7.RequestFactory; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java index fdc34b134..de8e944c8 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateCallbackTests.java @@ -42,7 +42,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; /** * @author Roman Puchkovskiy diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java index 9732dfa23..f8ffb104a 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java @@ -40,8 +40,8 @@ import org.springframework.dao.DataAccessException; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.IndicesOptions; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.UpdateQuery; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration; import org.springframework.data.elasticsearch.utils.IndexNameProvider; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateCallbackTests.java index 80d6843ac..9cfb26c0b 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateCallbackTests.java @@ -30,7 +30,7 @@ import org.mockito.Mock; import org.mockito.Spy; import org.springframework.data.annotation.Id; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.event.AfterConvertCallback; import org.springframework.data.elasticsearch.core.event.AfterSaveCallback; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index 1b109ac62..d75218eff 100755 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -83,10 +83,9 @@ import org.springframework.data.elasticsearch.annotations.MultiField; import org.springframework.data.elasticsearch.annotations.ScriptedField; import org.springframework.data.elasticsearch.annotations.Setting; -import org.springframework.data.elasticsearch.backend.elasticsearch7.RequestFactory; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.ScriptField; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.ScriptField; import org.springframework.data.elasticsearch.core.document.Explanation; import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.index.AliasAction; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/InnerHitsIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/InnerHitsIntegrationTests.java index 13e73e9ae..b136b25ac 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/InnerHitsIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/InnerHitsIntegrationTests.java @@ -35,8 +35,8 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.document.NestedMetaData; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; import org.springframework.lang.Nullable; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/LogEntityIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/LogEntityIntegrationTests.java index d05cf3651..a63f40c0b 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/LogEntityIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/LogEntityIntegrationTests.java @@ -33,8 +33,8 @@ import org.springframework.data.elasticsearch.annotations.DateFormat; import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.IndexQuery; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java index 6f74797f0..ab8b0bde7 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java @@ -55,9 +55,8 @@ import org.mockito.quality.Strictness; import org.springframework.data.annotation.Id; import org.springframework.data.domain.PageRequest; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.document.Document; import org.springframework.data.elasticsearch.core.event.ReactiveAfterConvertCallback; import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java index 9a5eb73e3..0b34f9fa6 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java @@ -70,27 +70,14 @@ import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.Mapping; import org.springframework.data.elasticsearch.annotations.Setting; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchAggregation; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.core.document.Explanation; import org.springframework.data.elasticsearch.core.index.AliasAction; import org.springframework.data.elasticsearch.core.index.AliasActionParameters; import org.springframework.data.elasticsearch.core.index.AliasActions; import org.springframework.data.elasticsearch.core.index.AliasData; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; -import org.springframework.data.elasticsearch.core.query.ByQueryResponse; -import org.springframework.data.elasticsearch.core.query.Criteria; -import org.springframework.data.elasticsearch.core.query.CriteriaQuery; -import org.springframework.data.elasticsearch.core.query.IndexQuery; -import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder; -import org.springframework.data.elasticsearch.core.query.Query; -import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm; -import org.springframework.data.elasticsearch.core.query.StringQuery; -import org.springframework.data.elasticsearch.core.query.UpdateQuery; -import org.springframework.data.elasticsearch.core.query.UpdateResponse; +import org.springframework.data.elasticsearch.core.query.*; import org.springframework.data.elasticsearch.junit.jupiter.ReactiveElasticsearchRestTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; import org.springframework.data.elasticsearch.utils.IndexNameProvider; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java index f13e5b411..c6f576364 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateUnitTests.java @@ -49,8 +49,7 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.ScriptedField; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ReactiveElasticsearchTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.Criteria; diff --git a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactoryTests.java b/src/test/java/org/springframework/data/elasticsearch/core/RequestFactoryTests.java similarity index 99% rename from src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactoryTests.java rename to src/test/java/org/springframework/data/elasticsearch/core/RequestFactoryTests.java index d0f0aa2a2..f513abc97 100644 --- a/src/test/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/RequestFactoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.elasticsearch.backend.elasticsearch7; +package org.springframework.data.elasticsearch.core; import static org.assertj.core.api.Assertions.*; import static org.elasticsearch.index.query.QueryBuilders.*; @@ -49,7 +49,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.annotations.Field; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter; import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.index.AliasAction; @@ -63,6 +62,7 @@ import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder; import org.springframework.data.elasticsearch.core.query.IndexQuery; import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.query.RescorerQuery; import org.springframework.data.elasticsearch.core.query.RescorerQuery.ScoreMode; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeTests.java b/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeTests.java index 4d5e9798e..b0f460915 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeTests.java @@ -37,7 +37,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.IndexQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/aggregation/AggregationIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/aggregation/AggregationIntegrationTests.java index b6e64eb8a..0becc1576 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/aggregation/AggregationIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/aggregation/AggregationIntegrationTests.java @@ -42,15 +42,15 @@ import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.InnerField; import org.springframework.data.elasticsearch.annotations.MultiField; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchAggregations; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.AggregationsContainer; +import org.springframework.data.elasticsearch.core.ElasticsearchAggregations; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.SearchHits; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.IndexQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; import org.springframework.data.elasticsearch.utils.IndexInitializer; import org.springframework.lang.Nullable; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/geo/GeoIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/geo/GeoIntegrationTests.java index b55dbce14..8ebae1beb 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/geo/GeoIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/geo/GeoIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.GeoPointField; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.SearchHit; import org.springframework.data.elasticsearch.core.SearchHits; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java index 8cec036ed..d54feea38 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java @@ -48,8 +48,8 @@ import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.*; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.MappingContextBaseTests; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyIntegrationTests.java index 90ef916e8..a7dc5558e 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyIntegrationTests.java @@ -26,7 +26,7 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.SearchHits; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyReactiveTemplateIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyReactiveTemplateIntegrationTests.java index 849fc765a..4fa1619e7 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyReactiveTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/mapping/FieldNamingStrategyReactiveTemplateIntegrationTests.java @@ -28,7 +28,7 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; import org.springframework.data.elasticsearch.core.ReactiveIndexOperations; import org.springframework.data.elasticsearch.core.query.Query; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilderTests.java b/src/test/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilderTests.java index 192aae32f..c4b7caf40 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilderTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/query/HighlightQueryBuilderTests.java @@ -28,7 +28,6 @@ import org.springframework.data.elasticsearch.annotations.Highlight; import org.springframework.data.elasticsearch.annotations.HighlightField; import org.springframework.data.elasticsearch.annotations.HighlightParameters; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.HighlightQueryBuilder; import org.springframework.data.elasticsearch.core.ResourceUtil; import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext; import org.springframework.lang.Nullable; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/suggest/CompletionIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/suggest/CompletionIntegrationTests.java index 295206317..e4896c8a1 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/suggest/CompletionIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/suggest/CompletionIntegrationTests.java @@ -30,8 +30,8 @@ import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.CompletionField; import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.SearchHits; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/suggest/SuggestReactiveTemplateIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/suggest/SuggestReactiveTemplateIntegrationTests.java index 3fe5c1100..52fba50b6 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/suggest/SuggestReactiveTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/suggest/SuggestReactiveTemplateIntegrationTests.java @@ -37,8 +37,8 @@ import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.CompletionField; import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.IndexQuery; diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java index 2a446822e..b33207e34 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java @@ -22,11 +22,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClients; -import org.springframework.data.elasticsearch.backend.elasticsearch7.config.AbstractElasticsearchConfiguration; import org.springframework.data.elasticsearch.client.ClientConfiguration; +import org.springframework.data.elasticsearch.client.RestClients; +import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.core.RefreshPolicy; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java index 7c557e09e..ef3e30fb3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java @@ -19,8 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.config.AbstractReactiveElasticsearchConfiguration; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; +import org.springframework.data.elasticsearch.config.AbstractReactiveElasticsearchConfiguration; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; import org.springframework.data.elasticsearch.core.RefreshPolicy; diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java b/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java index 87a766131..5e435cec7 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java @@ -20,10 +20,10 @@ import javax.enterprise.inject.Produces; import org.elasticsearch.client.RestHighLevelClient; -import org.springframework.data.elasticsearch.backend.elasticsearch7.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.backend.elasticsearch7.client.RestClients; import org.springframework.data.elasticsearch.client.ClientConfiguration; +import org.springframework.data.elasticsearch.client.RestClients; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.junit.jupiter.ClusterConnection; import org.springframework.data.elasticsearch.junit.jupiter.ClusterConnectionInfo; diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/uuidkeyed/UUIDElasticsearchRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/uuidkeyed/UUIDElasticsearchRepositoryIntegrationTests.java index 232181e18..16c01604a 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/uuidkeyed/UUIDElasticsearchRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/uuidkeyed/UUIDElasticsearchRepositoryIntegrationTests.java @@ -38,8 +38,8 @@ import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.ScriptedField; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.geo.GeoPoint; diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryIntegrationTests.java index b85c74f06..596a07356 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryIntegrationTests.java @@ -47,8 +47,8 @@ import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.backend.elasticsearch7.query.NativeSearchQueryBuilder; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration; import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; diff --git a/src/test/resources/org/springframework/data/elasticsearch/config/namespace/namespace.xml b/src/test/resources/org/springframework/data/elasticsearch/config/namespace/namespace.xml index cf721c1fa..030289fd8 100644 --- a/src/test/resources/org/springframework/data/elasticsearch/config/namespace/namespace.xml +++ b/src/test/resources/org/springframework/data/elasticsearch/config/namespace/namespace.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> + class="org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate">