Skip to content

Commit 38b9a0a

mp911de mp911de

committed

Deprecate pure repository SpEL support components for removal.

Closes #3207

1 parent 499abbe commit 38b9a0aCopy full SHA for 38b9a0a

File tree

8 files changed

+16

-10

lines changed

src/main/java/org/springframework/data/repository
- core/support
  - RepositoryFactoryBeanSupport.java
  - RepositoryFactorySupport.java
- query

8 files changed

+16

-10

lines changed

`‎src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public void setEvaluationContextProvider(EvaluationContextProvider evaluationCon`
`190`	`190`	`* @param evaluationContextProvider must not be {@literal null}.`
`191`	`191`	`* @deprecated since 3.4, use {@link #setEvaluationContextProvider(EvaluationContextProvider)} instead.`
`192`	`192`	`*/`
`193`		`- @Deprecated(since = "3.4")`
	`193`	`+ @Deprecated(since = "3.4", forRemoval = true)`
`194`	`194`	`public void setEvaluationContextProvider(QueryMethodEvaluationContextProvider evaluationContextProvider) {`
`195`	`195`	`setEvaluationContextProvider(evaluationContextProvider.getEvaluationContextProvider());`
`196`	`196`	`}`
`@@ -258,7 +258,7 @@ protected Optional<EvaluationContextProvider> createDefaultEvaluationContextProv`
`258`	`258`	`* @since 2.4`
`259`	`259`	`* @deprecated since 3.4, use {@link #createDefaultEvaluationContextProvider(ListableBeanFactory)} instead.`
`260`	`260`	`*/`
`261`		`- @Deprecated(since = "3.4")`
	`261`	`+ @Deprecated(since = "3.4", forRemoval = true)`
`262`	`262`	`protected Optional<QueryMethodEvaluationContextProvider> createDefaultQueryMethodEvaluationContextProvider(`
`263`	`263`	`ListableBeanFactory beanFactory) {`
`264`	`264`	`return Optional.of(new ExtensionAwareQueryMethodEvaluationContextProvider(beanFactory));`

`‎src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@`
`93`	`93`	`* @author John Blum`
`94`	`94`	`* @author Johannes Englmeier`
`95`	`95`	`*/`
	`96`	`+@SuppressWarnings("removal")`
`96`	`97`	`public abstract class RepositoryFactorySupport`
`97`	`98`	`implements BeanClassLoaderAware, BeanFactoryAware, EnvironmentAware, EnvironmentCapable {`
`98`	`99`
`@@ -216,7 +217,7 @@ public Environment getEnvironment() {`
`216`	`217`	`* {@link QueryMethodEvaluationContextProvider#DEFAULT}.`
`217`	`218`	`* @deprecated since 3.4, use {@link #setEvaluationContextProvider(EvaluationContextProvider)} instead.`
`218`	`219`	`*/`
`219`		`- @Deprecated(since = "3.4")`
	`220`	`+ @Deprecated(since = "3.4", forRemoval = true)`
`220`	`221`	`public void setEvaluationContextProvider(@Nullable QueryMethodEvaluationContextProvider evaluationContextProvider) {`
`221`	`222`	`setEvaluationContextProvider(evaluationContextProvider == null ? EvaluationContextProvider.DEFAULT`
`222`	`223`	`: evaluationContextProvider.getEvaluationContextProvider());`
`@@ -586,7 +587,7 @@ protected ProjectionFactory getProjectionFactory() {`
`586`	`587`	`* @deprecated since 3.4, use {@link #getQueryLookupStrategy(Key, ValueExpressionDelegate)} instead to support`
`587`	`588`	`* {@link org.springframework.data.expression.ValueExpression} in query methods.`
`588`	`589`	`*/`
`589`		`- @Deprecated(since = "3.4")`
	`590`	`+ @Deprecated(since = "3.4", forRemoval = true)`
`590`	`591`	`protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,`
`591`	`592`	`QueryMethodEvaluationContextProvider evaluationContextProvider) {`
`592`	`593`	`return Optional.empty();`

`‎src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@`
`38`	`38`	`* @since 1.9`
`39`	`39`	`* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.`
`40`	`40`	`*/`
`41`		`-@Deprecated(since = "3.4")`
	`41`	`+@SuppressWarnings("removal")`
	`42`	`+@Deprecated(since = "3.4", forRemoval = true)`
`42`	`43`	`public class ExtensionAwareQueryMethodEvaluationContextProvider implements QueryMethodEvaluationContextProvider {`
`43`	`44`
`44`	`45`	`private final QueryMethodValueEvaluationContextAccessor delegate;`

`‎src/main/java/org/springframework/data/repository/query/QueryMethodEvaluationContextProvider.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@`
`30`	`30`	`* @since 1.9`
`31`	`31`	`* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.`
`32`	`32`	`*/`
`33`		`-@Deprecated(since = "3.4")`
	`33`	`+@Deprecated(since = "3.4", forRemoval = true)`
	`34`	`+@SuppressWarnings("removal")`
`34`	`35`	`public interface QueryMethodEvaluationContextProvider {`
`35`	`36`
`36`	`37`	`QueryMethodEvaluationContextProvider DEFAULT = new ExtensionAwareQueryMethodEvaluationContextProvider(`

`‎src/main/java/org/springframework/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@`
`37`	`37`	`* @since 2.4`
`38`	`38`	`* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.`
`39`	`39`	`*/`
`40`		`-@Deprecated(since = "3.4")`
	`40`	`+@SuppressWarnings("removal")`
	`41`	`+@Deprecated(since = "3.4", forRemoval = true)`
`41`	`42`	`public class ReactiveExtensionAwareQueryMethodEvaluationContextProvider`
`42`	`43`	`extends ExtensionAwareQueryMethodEvaluationContextProvider`
`43`	`44`	`implements ReactiveQueryMethodEvaluationContextProvider {`

`‎src/main/java/org/springframework/data/repository/query/ReactiveQueryMethodEvaluationContextProvider.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* @since 2.4`
`31`	`31`	`* @deprecated since 3.4 in favor of {@link QueryMethodValueEvaluationContextAccessor}.`
`32`	`32`	`*/`
`33`		`-@Deprecated(since = "3.4")`
	`33`	`+@Deprecated(since = "3.4", forRemoval = true)`
`34`	`34`	`public interface ReactiveQueryMethodEvaluationContextProvider extends QueryMethodEvaluationContextProvider {`
`35`	`35`
`36`	`36`	`ReactiveQueryMethodEvaluationContextProvider DEFAULT = new ReactiveExtensionAwareQueryMethodEvaluationContextProvider(`

`‎src/main/java/org/springframework/data/repository/query/SpelEvaluator.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@`
`37`	`37`	`* @see SpelQueryContext#parse(String)`
`38`	`38`	`* @deprecated since 3.3, use {@link ValueExpressionQueryRewriter} instead.`
`39`	`39`	`*/`
`40`		`-@Deprecated(since = "3.3")`
	`40`	`+@SuppressWarnings("removal")`
	`41`	`+@Deprecated(since = "3.3", forRemoval = true)`
`41`	`42`	`public class SpelEvaluator {`
`42`	`43`
`43`	`44`	`private static final SpelExpressionParser PARSER = new SpelExpressionParser();`

`‎src/main/java/org/springframework/data/repository/query/SpelQueryContext.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@`
`60`	`60`	`* @since 2.1`
`61`	`61`	`* @deprecated since 3.3, use {@link ValueExpressionQueryRewriter} instead.`
`62`	`62`	`*/`
`63`		`-@Deprecated(since = "3.3")`
	`63`	`+@SuppressWarnings("removal")`
	`64`	`+@Deprecated(since = "3.3", forRemoval = true)`
`64`	`65`	`public class SpelQueryContext {`
`65`	`66`
`66`	`67`	`private static final String SPEL_PATTERN_STRING = "([:?])#\\{([^}]+)}";`

0 commit comments

Comments

(0)