Deprecate pure repository SpEL support components for removal.

Closes #3207
spring-projects · Nov 18, 2024 · 38b9a0a · 38b9a0a
1 parent 499abbe
commit 38b9a0a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/...n/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java b/...n/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
@@ -190,7 +190,7 @@ public void setEvaluationContextProvider(EvaluationContextProvider evaluationCon
 	 * @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 @@ protected Optional<EvaluationContextProvider> createDefaultEvaluationContextProv
 	 * @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));

diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java
@@ -93,6 +93,7 @@
  * @author John Blum
  * @author Johannes Englmeier
  */
+@SuppressWarnings("removal")
 public abstract class RepositoryFactorySupport
 		implements BeanClassLoaderAware, BeanFactoryAware, EnvironmentAware, EnvironmentCapable {
 
@@ -216,7 +217,7 @@ public Environment getEnvironment() {
 	 *          {@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 @@ protected ProjectionFactory getProjectionFactory() {
 	 * @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();

diff --git a/...ngframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java b/...ngframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java
@@ -38,7 +38,8 @@
  * @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;

diff --git a/.../java/org/springframework/data/repository/query/QueryMethodEvaluationContextProvider.java b/.../java/org/springframework/data/repository/query/QueryMethodEvaluationContextProvider.java
@@ -30,7 +30,8 @@
  * @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(

diff --git a/...ork/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java b/...ork/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java
@@ -37,7 +37,8 @@
  * @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 {

diff --git a/...g/springframework/data/repository/query/ReactiveQueryMethodEvaluationContextProvider.java b/...g/springframework/data/repository/query/ReactiveQueryMethodEvaluationContextProvider.java
@@ -30,7 +30,7 @@
  * @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(

diff --git a/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java b/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java
@@ -37,7 +37,8 @@
  * @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();

diff --git a/src/main/java/org/springframework/data/repository/query/SpelQueryContext.java b/src/main/java/org/springframework/data/repository/query/SpelQueryContext.java
@@ -60,7 +60,8 @@
  * @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 = "([:?])#\\{([^}]+)}";