Deprecate pure repository SpEL support components for removal.

Closes #3207
This commit is contained in:
Mark Paluch
2024-11-18 09:01:41 +01:00
parent 499abbee41
commit 38b9a0ac0b
8 changed files with 16 additions and 10 deletions

View File

@@ -190,7 +190,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
* @param evaluationContextProvider must not be {@literal null}.
* @deprecated since 3.4, use {@link #setEvaluationContextProvider(EvaluationContextProvider)} instead.
*/
@Deprecated(since = "3.4")
@Deprecated(since = "3.4", forRemoval = true)
public void setEvaluationContextProvider(QueryMethodEvaluationContextProvider evaluationContextProvider) {
setEvaluationContextProvider(evaluationContextProvider.getEvaluationContextProvider());
}
@@ -258,7 +258,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
* @since 2.4
* @deprecated since 3.4, use {@link #createDefaultEvaluationContextProvider(ListableBeanFactory)} instead.
*/
@Deprecated(since = "3.4")
@Deprecated(since = "3.4", forRemoval = true)
protected Optional<QueryMethodEvaluationContextProvider> createDefaultQueryMethodEvaluationContextProvider(
ListableBeanFactory beanFactory) {
return Optional.of(new ExtensionAwareQueryMethodEvaluationContextProvider(beanFactory));

View File

@@ -93,6 +93,7 @@ import org.springframework.util.ObjectUtils;
* @author John Blum
* @author Johannes Englmeier
*/
@SuppressWarnings("removal")
public abstract class RepositoryFactorySupport
implements BeanClassLoaderAware, BeanFactoryAware, EnvironmentAware, EnvironmentCapable {
@@ -216,7 +217,7 @@ public abstract class RepositoryFactorySupport
* {@link QueryMethodEvaluationContextProvider#DEFAULT}.
* @deprecated since 3.4, use {@link #setEvaluationContextProvider(EvaluationContextProvider)} instead.
*/
@Deprecated(since = "3.4")
@Deprecated(since = "3.4", forRemoval = true)
public void setEvaluationContextProvider(@Nullable QueryMethodEvaluationContextProvider evaluationContextProvider) {
setEvaluationContextProvider(evaluationContextProvider == null ? EvaluationContextProvider.DEFAULT
: evaluationContextProvider.getEvaluationContextProvider());
@@ -586,7 +587,7 @@ public abstract class RepositoryFactorySupport
* @deprecated since 3.4, use {@link #getQueryLookupStrategy(Key, ValueExpressionDelegate)} instead to support
* {@link org.springframework.data.expression.ValueExpression} in query methods.
*/
@Deprecated(since = "3.4")
@Deprecated(since = "3.4", forRemoval = true)
protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
QueryMethodEvaluationContextProvider evaluationContextProvider) {
return Optional.empty();

View File

@@ -38,7 +38,8 @@ import org.springframework.util.Assert;
* @since 1.9
* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.
*/
@Deprecated(since = "3.4")
@SuppressWarnings("removal")
@Deprecated(since = "3.4", forRemoval = true)
public class ExtensionAwareQueryMethodEvaluationContextProvider implements QueryMethodEvaluationContextProvider {
private final QueryMethodValueEvaluationContextAccessor delegate;

View File

@@ -30,7 +30,8 @@ import org.springframework.expression.EvaluationContext;
* @since 1.9
* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.
*/
@Deprecated(since = "3.4")
@Deprecated(since = "3.4", forRemoval = true)
@SuppressWarnings("removal")
public interface QueryMethodEvaluationContextProvider {
QueryMethodEvaluationContextProvider DEFAULT = new ExtensionAwareQueryMethodEvaluationContextProvider(

View File

@@ -37,7 +37,8 @@ import org.springframework.expression.EvaluationContext;
* @since 2.4
* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.
*/
@Deprecated(since = "3.4")
@SuppressWarnings("removal")
@Deprecated(since = "3.4", forRemoval = true)
public class ReactiveExtensionAwareQueryMethodEvaluationContextProvider
extends ExtensionAwareQueryMethodEvaluationContextProvider
implements ReactiveQueryMethodEvaluationContextProvider {

View File

@@ -30,7 +30,7 @@ import org.springframework.expression.EvaluationContext;
* @since 2.4
* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.
*/
@Deprecated(since = "3.4")
@Deprecated(since = "3.4", forRemoval = true)
public interface ReactiveQueryMethodEvaluationContextProvider extends QueryMethodEvaluationContextProvider {
ReactiveQueryMethodEvaluationContextProvider DEFAULT = new ReactiveExtensionAwareQueryMethodEvaluationContextProvider(

View File

@@ -37,7 +37,8 @@ import org.springframework.util.Assert;
* @see SpelQueryContext#parse(String)
* @deprecated since 3.3, use {@link ValueExpressionQueryRewriter} instead.
*/
@Deprecated(since = "3.3")
@SuppressWarnings("removal")
@Deprecated(since = "3.3", forRemoval = true)
public class SpelEvaluator {
private static final SpelExpressionParser PARSER = new SpelExpressionParser();

View File

@@ -60,7 +60,8 @@ import org.springframework.util.Assert;
* @since 2.1
* @deprecated since 3.3, use {@link ValueExpressionQueryRewriter} instead.
*/
@Deprecated(since = "3.3")
@SuppressWarnings("removal")
@Deprecated(since = "3.3", forRemoval = true)
public class SpelQueryContext {
private static final String SPEL_PATTERN_STRING = "([:?])#\\{([^}]+)}";