Skip to content

Commit c2f1d5a

Browse files
committed
Add missing since attributes to @deprecated
1 parent b213322 commit c2f1d5a

File tree

89 files changed

+205
-200
lines changed

Some content is hidden

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

89 files changed

+205
-200
lines changed

backend/elasticsearch-aws/src/main/java/org/hibernate/search/backend/elasticsearch/aws/spi/ElasticsearcAwsCredentialsProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* @deprecated Implement {@link ElasticsearchAwsCredentialsProvider} instead.
1313
*/
14-
@Deprecated
14+
@Deprecated(since = "6.1")
1515
public interface ElasticsearcAwsCredentialsProvider extends ElasticsearchAwsCredentialsProvider {
1616

1717
AwsCredentialsProvider create(ConfigurationPropertySource propertySource);

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchVersion.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public ElasticsearchDistributionName distribution() {
176176
* @return The "major" number of this version, i.e. the {@code x} in {@code x.y.z-qualifier}.
177177
* @deprecated Use {@link #majorOptional()} instead.
178178
*/
179-
@Deprecated
179+
@Deprecated(since = "7.0")
180180
public int major() {
181181
if ( major == null ) {
182182
return 0;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchBackendSettings.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,15 @@ private Defaults() {
341341
* is now dynamic and depends on the value of the {@link ElasticsearchBackendSettings#VERSION} property.
342342
* @see ElasticsearchBackendSettings#VERSION_CHECK_ENABLED
343343
*/
344-
@Deprecated
344+
@Deprecated(since = "7.0")
345345
public static final boolean VERSION_CHECK_ENABLED = true;
346346

347347
/**
348348
* @deprecated The default for this property is now dynamic and depends on the mapper.
349349
* If the multi-tenancy is enabled in the mapper, the default is {@link MultiTenancyStrategyName#DISCRIMINATOR}.
350350
* Otherwise, the default is still {@link MultiTenancyStrategyName#NONE}.
351351
*/
352-
@Deprecated
352+
@Deprecated(since = "6.1")
353353
public static final MultiTenancyStrategyName MULTI_TENANCY_STRATEGY = MultiTenancyStrategyName.NONE;
354354

355355
public static final TypeNameMappingStrategyName MAPPING_TYPE_NAME_STRATEGY = TypeNameMappingStrategyName.DISCRIMINATOR;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private Defaults() {
181181
* is now dynamic and depends on the targeted Elasticsearch distribution.
182182
* @see ElasticsearchIndexSettings#SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS
183183
*/
184-
@Deprecated
184+
@Deprecated(since = "7.0")
185185
public static final IndexStatus SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS = IndexStatus.YELLOW;
186186
public static final int SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS_WAIT_TIMEOUT = 10_000;
187187
public static final int INDEXING_QUEUE_COUNT = 10;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/spi/ElasticsearchBackendImplSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
* @deprecated Use {@link org.hibernate.search.backend.elasticsearch.cfg.impl.ElasticsearchBackendImplSettings} instead.
1111
*/
12-
@Deprecated
12+
@Deprecated(since = "6.2")
1313
public final class ElasticsearchBackendImplSettings {
1414

1515
private ElasticsearchBackendImplSettings() {

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/cfg/LuceneBackendSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private Defaults() {
106106
* If the multi-tenancy is enabled in the mapper, the default is {@link MultiTenancyStrategyName#DISCRIMINATOR}.
107107
* Otherwise, the default is still {@link MultiTenancyStrategyName#NONE}.
108108
*/
109-
@Deprecated
109+
@Deprecated(since = "6.1")
110110
public static final MultiTenancyStrategyName MULTI_TENANCY_STRATEGY = MultiTenancyStrategyName.NONE;
111111
}
112112
}

build/config/src/main/resources/checkstyle.xml

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
<property name="message" value="Avoid throwing 'AssertionError': use org.hibernate.search.util.common.AssertionFailure" />
111111
</module>
112112

113+
<module name="RegexpSingleline">
114+
<property name="format" value="@Deprecated(?:\s*+\(\s*+(?!.*\bsince\s*+=).*\))?\s*+[^(].*+" />
115+
<property name="message" value="When deprecating something include the `since` attribute" />
116+
</module>
117+
113118
<module name="SuppressionFilter">
114119
<property name="file" value="/suppressions.xml" />
115120
</module>

engine/src/main/java/org/hibernate/search/engine/Version.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static String versionString() {
2828
* @return A string representation of the version of Hibernate Search.
2929
* @deprecated Use {@link #versionString()} instead.
3030
*/
31-
@Deprecated
31+
@Deprecated(since = "6.0")
3232
@Search5DeprecatedAPI
3333
public static String getVersionString() {
3434
return versionString();

engine/src/main/java/org/hibernate/search/engine/backend/orchestration/spi/BatchingExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public synchronized void stop() {
105105
/**
106106
* @deprecated Use {@link #submit(BatchedWork, OperationSubmitter)} instead.
107107
*/
108-
@Deprecated
108+
@Deprecated(since = "6.2")
109109
public void submit(W work) throws InterruptedException {
110110
submit( work, OperationSubmitter.blocking() );
111111
}

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/FromDocumentFieldValueConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @param <V> The type of target values.
1414
* @deprecated Implement {@link FromDocumentValueConverter} instead.
1515
*/
16-
@Deprecated
16+
@Deprecated(since = "6.1")
1717
public interface FromDocumentFieldValueConverter<F, V> extends FromDocumentValueConverter<F, V> {
1818

1919
@Override

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/ToDocumentFieldValueConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @param <F> The type of target, index field values.
1414
* @deprecated Implement {@link ToDocumentValueConverter} instead.
1515
*/
16-
@Deprecated
16+
@Deprecated(since = "6.1")
1717
public interface ToDocumentFieldValueConverter<V, F> extends ToDocumentValueConverter<V, F> {
1818

1919
@Override

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/runtime/FromDocumentFieldValueConvertContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @deprecated Use {@link org.hibernate.search.engine.backend.types.converter.FromDocumentValueConverter}
1111
* with {@link FromDocumentValueConvertContext} instead.
1212
*/
13-
@Deprecated
13+
@Deprecated(since = "6.1")
1414
public interface FromDocumentFieldValueConvertContext {
1515

1616
/**

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/runtime/FromDocumentFieldValueConvertContextExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @deprecated Use {@link org.hibernate.search.engine.backend.types.converter.FromDocumentValueConverter}
2424
* with {@link FromDocumentValueConvertContext} and {@link FromDocumentValueConvertContextExtension} instead.
2525
*/
26-
@Deprecated
26+
@Deprecated(since = "6.1")
2727
public interface FromDocumentFieldValueConvertContextExtension<T> extends FromDocumentValueConvertContextExtension<T> {
2828

2929
@Override

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/runtime/ToDocumentFieldValueConvertContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @deprecated Use {@link org.hibernate.search.engine.backend.types.converter.ToDocumentValueConverter}
1111
* with {@link ToDocumentValueConvertContext} instead.
1212
*/
13-
@Deprecated
13+
@Deprecated(since = "6.1")
1414
public interface ToDocumentFieldValueConvertContext {
1515

1616
/**

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/runtime/ToDocumentFieldValueConvertContextExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @deprecated Use {@link org.hibernate.search.engine.backend.types.converter.ToDocumentValueConverter}
2424
* with {@link ToDocumentValueConvertContext} and {@link ToDocumentValueConvertContextExtension} instead.
2525
*/
26-
@Deprecated
26+
@Deprecated(since = "6.1")
2727
public interface ToDocumentFieldValueConvertContextExtension<T> extends ToDocumentValueConvertContextExtension<T> {
2828

2929
@Override

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/runtime/spi/FromDocumentValueConvertContextImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public FromDocumentValueConvertContextImpl(BackendSessionContext sessionContext)
1717
}
1818

1919
@Override
20-
@Deprecated
20+
@Deprecated(since = "6.1")
2121
public <T> T extension(
2222
org.hibernate.search.engine.backend.types.converter.runtime.FromDocumentFieldValueConvertContextExtension<
2323
T> extension) {

engine/src/main/java/org/hibernate/search/engine/backend/types/converter/runtime/spi/ToDocumentValueConvertContextImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ToDocumentValueConvertContextImpl(BackendMappingContext mappingContext) {
1717
}
1818

1919
@Override
20-
@Deprecated
20+
@Deprecated(since = "6.1")
2121
public <T> T extension(
2222
org.hibernate.search.engine.backend.types.converter.runtime.ToDocumentFieldValueConvertContextExtension<
2323
T> extension) {

engine/src/main/java/org/hibernate/search/engine/cfg/spi/KeyContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public interface KeyContext {
1717
* @return The next context.
1818
* @deprecated Use {@link #asIntegerPositiveOrZeroOrNegative()} instead.
1919
*/
20-
@Deprecated
20+
@Deprecated(since = "6.1")
2121
default OptionalPropertyContext<Integer> asInteger() {
2222
return asIntegerPositiveOrZeroOrNegative();
2323
}
@@ -32,7 +32,7 @@ default OptionalPropertyContext<Integer> asInteger() {
3232
* @return The next context.
3333
* @deprecated Use {@link #asLongPositiveOrZeroOrNegative()} instead.
3434
*/
35-
@Deprecated
35+
@Deprecated(since = "6.1")
3636
default OptionalPropertyContext<Long> asLong() {
3737
return asLongPositiveOrZeroOrNegative();
3838
}

engine/src/main/java/org/hibernate/search/engine/reporting/EntityIndexingFailureContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private EntityIndexingFailureContext(Builder builder) {
3737
*/
3838
// The cast is safe because Object is a supertype of EntityReference and the list is unmodifiable.
3939
@SuppressWarnings({ "rawtypes", "unchecked" })
40-
@Deprecated
40+
@Deprecated(since = "6.2")
4141
public List<Object> entityReferences() {
4242
return (List<Object>) (List) failingEntityReferences;
4343
}
@@ -70,7 +70,7 @@ private Builder() {
7070
* @param entityReference A reference to an entity related to the failing operation.
7171
* @deprecated Use {@link #failingEntityReference(EntityReference)} instead.
7272
*/
73-
@Deprecated
73+
@Deprecated(since = "6.2")
7474
public void entityReference(Object entityReference) {
7575
// This may fail for callers that don't retrieve the reference the usual way,
7676
// but we consider that acceptable as this builder should only be used by integrators

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationFieldStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ default <F> RangeAggregationRangeStep<?, PDF, F> field(String fieldPath, Class<F
3939
* @return The next step.
4040
* @deprecated Use {@link #field(String, Class, ValueModel)} instead.
4141
*/
42-
@Deprecated
42+
@Deprecated(since = "7.2")
4343
default <F> RangeAggregationRangeStep<?, PDF, F> field(String fieldPath, Class<F> type,
4444
org.hibernate.search.engine.search.common.ValueConvert convert) {
4545
return field( fieldPath, type,

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationFieldStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ default <F> TermsAggregationOptionsStep<?, PDF, F, Map<F, Long>> field(String fi
4040
* @return The next step.
4141
* @deprecated Use {@link #field(String, Class, ValueModel)} instead.
4242
*/
43-
@Deprecated
43+
@Deprecated(since = "7.2")
4444
default <F> TermsAggregationOptionsStep<?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
4545
org.hibernate.search.engine.search.common.ValueConvert convert) {
4646
return field( fieldPath, type,

engine/src/main/java/org/hibernate/search/engine/search/common/ValueConvert.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Specifies whether values should be converted during search queries.
1515
* @deprecated Use {@link ValueModel} instead.
1616
*/
17-
@Deprecated
17+
@Deprecated(since = "7.2")
1818
public enum ValueConvert {
1919

2020
/**
@@ -43,7 +43,7 @@ public enum ValueConvert {
4343
*
4444
* @deprecated Use {@link ValueModel#MAPPING} instead.
4545
*/
46-
@Deprecated
46+
@Deprecated(since = "7.2")
4747
YES,
4848
/**
4949
* Disables value conversion.
@@ -64,7 +64,7 @@ public enum ValueConvert {
6464
*
6565
* @deprecated Use {@link ValueModel#INDEX} instead.
6666
*/
67-
@Deprecated
67+
@Deprecated(since = "7.2")
6868
NO,
6969
/**
7070
* The result of applying this constant is the same as {@link #YES}.
@@ -73,10 +73,10 @@ public enum ValueConvert {
7373
* It is used as default value in some annotations like {@code FieldProjection} to help determine
7474
* if the attribute value was not set explicitly.
7575
*/
76-
@Deprecated
76+
@Deprecated(since = "7.2")
7777
DEFAULT;
7878

79-
@Deprecated
79+
@Deprecated(since = "7.2")
8080
public static ValueModel toValueModel(ValueConvert valueConvert) {
8181
Contracts.assertNotNull( valueConvert, "valueConvert" );
8282
switch ( valueConvert ) {

engine/src/main/java/org/hibernate/search/engine/search/common/ValueModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,6 @@ public enum ValueModel {
113113
* @deprecated This constant is deprecated and will be removed at the same time as the {@link ValueConvert} enum is removed.
114114
* Do <b>not</b> use this value explicitly.
115115
*/
116-
@Deprecated(forRemoval = true)
116+
@Deprecated(since = "7.2", forRemoval = true)
117117
DEFAULT
118118
}

engine/src/main/java/org/hibernate/search/engine/search/predicate/definition/PredicateDefinitionContext.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public interface PredicateDefinitionContext {
3636
* @see NamedPredicateOptionsStep#param(String, Object)
3737
* @deprecated Use {@link #params()} instead.
3838
*/
39-
@Deprecated
39+
@Deprecated(since = "7.0")
4040
default Object param(String name) {
4141
return params().get( name, Object.class );
4242
}
@@ -50,7 +50,7 @@ default Object param(String name) {
5050
* @see NamedPredicateOptionsStep#param(String, Object)
5151
* @deprecated Use {@link #params()} instead.
5252
*/
53-
@Deprecated
53+
@Deprecated(since = "7.2")
5454
default <T> T param(String name, Class<T> paramType) {
5555
return params().get( name, paramType );
5656
}
@@ -62,7 +62,7 @@ default <T> T param(String name, Class<T> paramType) {
6262
* @see NamedPredicateOptionsStep#param(String, Object)
6363
* @deprecated Use {@link #params()} instead.
6464
*/
65-
@Deprecated
65+
@Deprecated(since = "7.0")
6666
default Optional<Object> paramOptional(String name) {
6767
return params().getOptional( name, Object.class );
6868
}
@@ -76,7 +76,7 @@ default Optional<Object> paramOptional(String name) {
7676
* @see NamedPredicateOptionsStep#param(String, Object)
7777
* @deprecated Use {@link #params()} instead.
7878
*/
79-
@Deprecated
79+
@Deprecated(since = "7.2")
8080
default <T> Optional<T> paramOptional(String name, Class<T> paramType) {
8181
return params().getOptional( name, paramType );
8282
}

engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MatchIdPredicateMatchingStep.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ default N matching(Object value) {
3939
* @return The next step.
4040
* @deprecated Use {@link #matching(Object, ValueModel)} instead.
4141
*/
42-
@Deprecated
42+
@Deprecated(since = "7.2")
4343
default N matching(Object value, org.hibernate.search.engine.search.common.ValueConvert convert) {
4444
return matching( value, org.hibernate.search.engine.search.common.ValueConvert.toValueModel( convert ) );
4545
}
@@ -75,7 +75,7 @@ default N matchingAny(Collection<?> values) {
7575
* @return The next step.
7676
* @deprecated Use {@link #matchingAny(Collection, ValueModel)} instead.
7777
*/
78-
@Deprecated
78+
@Deprecated(since = "7.2")
7979
default N matchingAny(Collection<?> values, org.hibernate.search.engine.search.common.ValueConvert convert) {
8080
return matching( values, org.hibernate.search.engine.search.common.ValueConvert.toValueModel( convert ) );
8181
}

engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MatchPredicateMatchingStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ default N matching(Object value) {
4545
*
4646
* @see org.hibernate.search.engine.search.common.ValueConvert
4747
*/
48-
@Deprecated
48+
@Deprecated(since = "7.2")
4949
default N matching(Object value, org.hibernate.search.engine.search.common.ValueConvert convert) {
5050
return matching( value, org.hibernate.search.engine.search.common.ValueConvert.toValueModel( convert ) );
5151
}

engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/NestedPredicateFieldStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @param <N> The type of the next step.
1313
* @deprecated Use {@link SearchPredicateFactory#nested(String)} instead.
1414
*/
15-
@Deprecated
15+
@Deprecated(since = "6.2")
1616
public interface NestedPredicateFieldStep<N extends NestedPredicateNestStep<?>> {
1717

1818
/**

engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/NestedPredicateNestStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @param <N> The type of the next step.
1515
* @deprecated Use {@link SearchPredicateFactory#nested(String)} instead.
1616
*/
17-
@Deprecated
17+
@Deprecated(since = "6.2")
1818
public interface NestedPredicateNestStep<N extends NestedPredicateOptionsStep<?>> {
1919

2020
/**

engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/NestedPredicateOptionsStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @param <S> The "self" type (the actual exposed type of this step).
1111
* @deprecated Use {@link SearchPredicateFactory#nested(String)} instead.
1212
*/
13-
@Deprecated
13+
@Deprecated(since = "6.2")
1414
public interface NestedPredicateOptionsStep<S extends NestedPredicateOptionsStep<?>>
1515
extends PredicateFinalStep {
1616

0 commit comments

Comments
 (0)