Adjust @since annotation of classes moved to new package.

Original Pull Request #2014 
Closes #2010
This commit is contained in:
Peter-Josef Meisch 2021-11-23 20:53:14 +01:00 committed by GitHub
parent 49324a369a
commit 989c2807fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 32 additions and 70 deletions

View File

@ -47,6 +47,7 @@ import org.springframework.util.Assert;
* @author Mohsin Husen * @author Mohsin Husen
* @author Artur Konczak * @author Artur Konczak
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4
*/ */
class CriteriaFilterProcessor { class CriteriaFilterProcessor {

View File

@ -44,6 +44,7 @@ import org.springframework.util.Assert;
* @author Rasmus Faber-Espensen * @author Rasmus Faber-Espensen
* @author James Bodkin * @author James Bodkin
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4
*/ */
class CriteriaQueryProcessor { class CriteriaQueryProcessor {

View File

@ -23,7 +23,7 @@ import org.springframework.lang.NonNull;
* AggregationContainer implementation for an Elasticsearch7 aggregation. * AggregationContainer implementation for an Elasticsearch7 aggregation.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.3 * @since 4.4
*/ */
public class ElasticsearchAggregation implements AggregationContainer<Aggregation> { public class ElasticsearchAggregation implements AggregationContainer<Aggregation> {

View File

@ -23,7 +23,7 @@ import org.springframework.lang.NonNull;
* AggregationsContainer implementation for the Elasticsearch7 aggregations. * AggregationsContainer implementation for the Elasticsearch7 aggregations.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.3 * @since 4.4
*/ */
public class ElasticsearchAggregations implements AggregationsContainer<Aggregations> { public class ElasticsearchAggregations implements AggregationsContainer<Aggregations> {

View File

@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Roman Puchkovskiy * @author Roman Puchkovskiy
* @author Mark Paluch * @author Mark Paluch
* @since 3.2 * @since 4.4
*/ */
public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator { public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {

View File

@ -113,6 +113,7 @@ import org.springframework.util.Assert;
* @author Gyula Attila Csorogi * @author Gyula Attila Csorogi
* @author Massimiliano Poggi * @author Massimiliano Poggi
* @author Farid Faoudi * @author Farid Faoudi
* @since 4.4
*/ */
public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate { public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {

View File

@ -105,7 +105,7 @@ import org.springframework.util.Assert;
* @author Russell Parry * @author Russell Parry
* @author Thomas Geese * @author Thomas Geese
* @author Farid Faoudi * @author Farid Faoudi
* @since 3.2 * @since 4.4
*/ */
public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations, ApplicationContextAware { public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations, ApplicationContextAware {

View File

@ -65,7 +65,7 @@ import org.springframework.util.Assert;
/** /**
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author George Popides * @author George Popides
* @since 4.1 * @since 4.4
*/ */
class ReactiveIndexTemplate implements ReactiveIndexOperations { class ReactiveIndexTemplate implements ReactiveIndexOperations {

View File

@ -117,7 +117,7 @@ import org.springframework.util.StringUtils;
* @author Farid Faoudi * @author Farid Faoudi
* @author Peer Mueller * @author Peer Mueller
* @author vdisk * @author vdisk
* @since 4.0 * @since 4.4
*/ */
// todo make package private again after refactoring // todo make package private again after refactoring
public class RequestFactory { public class RequestFactory {

View File

@ -56,7 +56,7 @@ import org.springframework.util.Assert;
* *
* @author George Popides * @author George Popides
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.2 * @since 4.4
*/ */
public class ResponseConverter { public class ResponseConverter {
private ResponseConverter() {} private ResponseConverter() {}

View File

@ -62,7 +62,7 @@ import org.springframework.util.Assert;
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Sascha Woo * @author Sascha Woo
* @author George Popides * @author George Popides
* @since 4.0 * @since 4.4
*/ */
class RestIndexTemplate extends AbstractIndexTemplate implements IndexOperations { class RestIndexTemplate extends AbstractIndexTemplate implements IndexOperations {

View File

@ -21,7 +21,7 @@ import org.elasticsearch.search.SearchHits;
* Utility class to prevent leaking of Lucene API into Spring Data Elasticsearch. * Utility class to prevent leaking of Lucene API into Spring Data Elasticsearch.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.0 * @since 4.4
*/ */
public final class SearchHitsUtil { public final class SearchHitsUtil {
private SearchHitsUtil() {} private SearchHitsUtil() {}

View File

@ -35,6 +35,7 @@ import org.springframework.util.Assert;
* *
* @author Don Wellington * @author Don Wellington
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4
*/ */
public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean { public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean {

View File

@ -59,7 +59,7 @@ import org.springframework.util.Assert;
* @author Henrique Amaral * @author Henrique Amaral
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Nic Hines * @author Nic Hines
* @since 3.2 * @since 4.4
*/ */
public final class RestClients { public final class RestClients {

View File

@ -147,7 +147,7 @@ import org.springframework.web.reactive.function.client.WebClient.RequestBodySpe
* @author Brian Clozel * @author Brian Clozel
* @author Farid Faoudi * @author Farid Faoudi
* @author George Popides * @author George Popides
* @since 3.2 * @since 4.4
* @see ClientConfiguration * @see ClientConfiguration
* @see ReactiveRestClients * @see ReactiveRestClients
*/ */

View File

@ -17,6 +17,6 @@ package org.springframework.data.elasticsearch.backend.elasticsearch7.client.rea
/** /**
* @author Roman Puchkovskiy * @author Roman Puchkovskiy
* @since 4.0 * @since 4.4
*/ */
class DefaultRequestCreator implements RequestCreator {} class DefaultRequestCreator implements RequestCreator {}

View File

@ -32,7 +32,7 @@ import org.springframework.web.reactive.function.client.ClientResponse;
* @author Christoph Strobl * @author Christoph Strobl
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Mark Paluch * @author Mark Paluch
* @since 3.2 * @since 4.4
*/ */
// todo make package private again after refactoring? // todo make package private again after refactoring?
public class RawActionResponse extends ActionResponse { public class RawActionResponse extends ActionResponse {

View File

@ -77,7 +77,7 @@ import org.springframework.web.reactive.function.client.WebClient;
* @author Henrique Amaral * @author Henrique Amaral
* @author Thomas Geese * @author Thomas Geese
* @author Farid Faoudi * @author Farid Faoudi
* @since 3.2 * @since 4.4
* @see ClientConfiguration * @see ClientConfiguration
* @see ReactiveRestClients * @see ReactiveRestClients
*/ */

View File

@ -58,7 +58,7 @@ import org.springframework.data.elasticsearch.backend.elasticsearch7.client.util
* @author Roman Puchkovskiy * @author Roman Puchkovskiy
* @author Farid Faoudi * @author Farid Faoudi
* @author George Popides * @author George Popides
* @since 4.0 * @since 4.4
*/ */
public interface RequestCreator { public interface RequestCreator {

View File

@ -91,7 +91,7 @@ import org.springframework.data.elasticsearch.backend.elasticsearch7.client.reac
* Only intended for internal use. * Only intended for internal use.
* *
* @author Russell Parry * @author Russell Parry
* @since 4.0 * @since 4.4
*/ */
public class NamedXContents { public class NamedXContents {

View File

@ -119,7 +119,7 @@ import org.springframework.lang.Nullable;
* @author Christoph Strobl * @author Christoph Strobl
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Farid Faoudi * @author Farid Faoudi
* @since 3.2 * @since 4.4
*/ */
@SuppressWarnings("JavadocReference") @SuppressWarnings("JavadocReference")
public class RequestConverters { public class RequestConverters {

View File

@ -27,7 +27,7 @@ import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
* Default implementation of {@link ClusterOperations} using the {@link ElasticsearchRestTemplate}. * Default implementation of {@link ClusterOperations} using the {@link ElasticsearchRestTemplate}.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.2 * @since 4.4
*/ */
class DefaultClusterOperations implements ClusterOperations { class DefaultClusterOperations implements ClusterOperations {

View File

@ -27,7 +27,7 @@ import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperat
* Default implementation of {@link ReactiveClusterOperations} using the {@link ReactiveElasticsearchOperations}. * Default implementation of {@link ReactiveClusterOperations} using the {@link ReactiveElasticsearchOperations}.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.2 * @since 4.4
*/ */
public class DefaultReactiveClusterOperations implements ReactiveClusterOperations { public class DefaultReactiveClusterOperations implements ReactiveClusterOperations {
private final ReactiveElasticsearchOperations operations; private final ReactiveElasticsearchOperations operations;

View File

@ -21,7 +21,7 @@ import org.springframework.util.Assert;
/** /**
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.3 * @since 4.4
*/ */
public class ElasticsearchClusterOperations { public class ElasticsearchClusterOperations {
/** /**

View File

@ -25,7 +25,7 @@ import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverte
/** /**
* @author Christoph Strobl * @author Christoph Strobl
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 3.2 * @since 4.4
* @see ElasticsearchConfigurationSupport * @see ElasticsearchConfigurationSupport
*/ */
public abstract class AbstractElasticsearchConfiguration extends ElasticsearchConfigurationSupport { public abstract class AbstractElasticsearchConfiguration extends ElasticsearchConfigurationSupport {

View File

@ -28,7 +28,7 @@ import org.springframework.lang.Nullable;
/** /**
* @author Christoph Strobl * @author Christoph Strobl
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 3.2 * @since 4.4
* @see ElasticsearchConfigurationSupport * @see ElasticsearchConfigurationSupport
*/ */
public abstract class AbstractReactiveElasticsearchConfiguration extends ElasticsearchConfigurationSupport { public abstract class AbstractReactiveElasticsearchConfiguration extends ElasticsearchConfigurationSupport {

View File

@ -64,7 +64,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Roman Puchkovskiy * @author Roman Puchkovskiy
* @author Matt Gilene * @author Matt Gilene
* @since 4.0 * @since 4.4
*/ */
public final class DocumentAdapters { public final class DocumentAdapters {

View File

@ -42,7 +42,7 @@ import org.springframework.util.Assert;
* created with the {@link #from(SearchResponse,Function)} method. * created with the {@link #from(SearchResponse,Function)} method.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.0 * @since 4.4
*/ */
public class SearchDocumentResponse { public class SearchDocumentResponse {

View File

@ -35,6 +35,7 @@ import org.springframework.util.StringUtils;
* Converts the {@link Highlight} annotation from a method to an Elasticsearch {@link HighlightBuilder}. * Converts the {@link Highlight} annotation from a method to an Elasticsearch {@link HighlightBuilder}.
* *
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4
*/ */
public class HighlightQueryBuilder { public class HighlightQueryBuilder {

View File

@ -43,6 +43,7 @@ import org.springframework.lang.Nullable;
* @author Jean-Baptiste Nizet * @author Jean-Baptiste Nizet
* @author Martin Choraine * @author Martin Choraine
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @since 4.4
*/ */
public class NativeSearchQuery extends BaseQuery { public class NativeSearchQuery extends BaseQuery {

View File

@ -55,6 +55,7 @@ import org.springframework.lang.Nullable;
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Peer Mueller * @author Peer Mueller
* @author vdisk * @author vdisk
* @since 4.4
*/ */
public class NativeSearchQueryBuilder { public class NativeSearchQueryBuilder {
@ -105,17 +106,11 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withSorts(Collection<SortBuilder<?>> sortBuilders) { public NativeSearchQueryBuilder withSorts(Collection<SortBuilder<?>> sortBuilders) {
this.sortBuilders.addAll(sortBuilders); this.sortBuilders.addAll(sortBuilders);
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withSorts(SortBuilder<?>... sortBuilders) { public NativeSearchQueryBuilder withSorts(SortBuilder<?>... sortBuilders) {
Collections.addAll(this.sortBuilders, sortBuilders); Collections.addAll(this.sortBuilders, sortBuilders);
return this; return this;
@ -131,9 +126,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withCollapseBuilder(@Nullable CollapseBuilder collapseBuilder) { public NativeSearchQueryBuilder withCollapseBuilder(@Nullable CollapseBuilder collapseBuilder) {
this.collapseBuilder = collapseBuilder; this.collapseBuilder = collapseBuilder;
return this; return this;
@ -148,17 +140,11 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withAggregations(Collection<AbstractAggregationBuilder<?>> aggregationBuilders) { public NativeSearchQueryBuilder withAggregations(Collection<AbstractAggregationBuilder<?>> aggregationBuilders) {
this.aggregationBuilders.addAll(aggregationBuilders); this.aggregationBuilders.addAll(aggregationBuilders);
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withAggregations(AbstractAggregationBuilder<?>... aggregationBuilders) { public NativeSearchQueryBuilder withAggregations(AbstractAggregationBuilder<?>... aggregationBuilders) {
Collections.addAll(this.aggregationBuilders, aggregationBuilders); Collections.addAll(this.aggregationBuilders, aggregationBuilders);
return this; return this;
@ -173,18 +159,12 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withPipelineAggregations( public NativeSearchQueryBuilder withPipelineAggregations(
Collection<PipelineAggregationBuilder> pipelineAggregationBuilders) { Collection<PipelineAggregationBuilder> pipelineAggregationBuilders) {
this.pipelineAggregationBuilders.addAll(pipelineAggregationBuilders); this.pipelineAggregationBuilders.addAll(pipelineAggregationBuilders);
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withPipelineAggregations(PipelineAggregationBuilder... pipelineAggregationBuilders) { public NativeSearchQueryBuilder withPipelineAggregations(PipelineAggregationBuilder... pipelineAggregationBuilders) {
Collections.addAll(this.pipelineAggregationBuilders, pipelineAggregationBuilders); Collections.addAll(this.pipelineAggregationBuilders, pipelineAggregationBuilders);
return this; return this;
@ -200,9 +180,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withHighlightFields(Collection<HighlightBuilder.Field> highlightFields) { public NativeSearchQueryBuilder withHighlightFields(Collection<HighlightBuilder.Field> highlightFields) {
this.highlightFields.addAll(highlightFields); this.highlightFields.addAll(highlightFields);
return this; return this;
@ -213,9 +190,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withIndicesBoost(IndexBoost... indicesBoost) { public NativeSearchQueryBuilder withIndicesBoost(IndexBoost... indicesBoost) {
Collections.addAll(this.indicesBoost, indicesBoost); Collections.addAll(this.indicesBoost, indicesBoost);
return this; return this;
@ -231,9 +205,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withFields(Collection<String> fields) { public NativeSearchQueryBuilder withFields(Collection<String> fields) {
this.fields.addAll(fields); this.fields.addAll(fields);
return this; return this;
@ -244,9 +215,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.4
*/
public NativeSearchQueryBuilder withStoredFields(Collection<String> storedFields) { public NativeSearchQueryBuilder withStoredFields(Collection<String> storedFields) {
if (this.storedFields == null) { if (this.storedFields == null) {
@ -257,9 +225,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.4
*/
public NativeSearchQueryBuilder withStoredFields(String... storedFields) { public NativeSearchQueryBuilder withStoredFields(String... storedFields) {
if (this.storedFields == null) { if (this.storedFields == null) {
@ -282,7 +247,6 @@ public class NativeSearchQueryBuilder {
/** /**
* @param trackScores whether to track scores. * @param trackScores whether to track scores.
* @return this object * @return this object
* @since 3.1
*/ */
public NativeSearchQueryBuilder withTrackScores(boolean trackScores) { public NativeSearchQueryBuilder withTrackScores(boolean trackScores) {
this.trackScores = trackScores; this.trackScores = trackScores;
@ -294,9 +258,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withIds(String... ids) { public NativeSearchQueryBuilder withIds(String... ids) {
Collections.addAll(this.ids, ids); Collections.addAll(this.ids, ids);
return this; return this;
@ -327,9 +288,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.2
*/
public NativeSearchQueryBuilder withTrackTotalHits(Boolean trackTotalHits) { public NativeSearchQueryBuilder withTrackTotalHits(Boolean trackTotalHits) {
this.trackTotalHits = trackTotalHits; this.trackTotalHits = trackTotalHits;
return this; return this;
@ -345,9 +303,6 @@ public class NativeSearchQueryBuilder {
return this; return this;
} }
/**
* @since 4.3
*/
public NativeSearchQueryBuilder withSuggestBuilder(SuggestBuilder suggestBuilder) { public NativeSearchQueryBuilder withSuggestBuilder(SuggestBuilder suggestBuilder) {
this.suggestBuilder = suggestBuilder; this.suggestBuilder = suggestBuilder;
return this; return this;

View File

@ -20,6 +20,7 @@ import org.elasticsearch.script.Script;
/** /**
* @author Ryan Murfitt * @author Ryan Murfitt
* @author Artur Konczak * @author Artur Konczak
* @since 4.4
*/ */
public class ScriptField { public class ScriptField {