Try to parse SpEL expressions in @query sooner.

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java

@@ -17,6 +17,7 @@
 
 import java.util.List;
 
+import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
@@ -37,7 +38,21 @@ interface DeclaredQuery {
  * @return a {@literal DeclaredQuery} instance even for a {@literal null} or empty argument.
  */
  static DeclaredQuery of(@Nullable String query, boolean nativeQuery) {
- return ObjectUtils.isEmpty(query) ? EmptyDeclaredQuery.EMPTY_QUERY : new StringQuery(query, nativeQuery);
+ return of(query, nativeQuery, null, null);
+ }
+
+ static DeclaredQuery of(@Nullable String query, boolean nativeQuery, @Nullable JpaEntityMetadata<?> entityMetadata,
+ @Nullable SpelExpressionParser parser) {
+
+ if (ObjectUtils.isEmpty(query)) {
+ return EmptyDeclaredQuery.EMPTY_QUERY;
+ }
+
+ if (entityMetadata != null) {
+ return new ExpressionBasedStringQuery(query, entityMetadata, parser, nativeQuery);
+ }
+
+ return new StringQuery(query, nativeQuery);
  }
 
  /**

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQuery.java

@@ -61,7 +61,7 @@ class ExpressionBasedStringQuery extends StringQuery {
  */
  public ExpressionBasedStringQuery(String query, JpaEntityMetadata<?> metadata, SpelExpressionParser parser,
  boolean nativeQuery) {
- super(renderQueryIfExpressionOrReturnQuery(query, metadata, parser), nativeQuery && !containsExpression(query));
+ super(renderQueryIfExpressionOrReturnQuery(query, metadata, parser), nativeQuery);
  }
 
  /**

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryFactory.java

@@ -34,7 +34,7 @@ enum JpaQueryFactory {
 
  INSTANCE;
 
- private static final SpelExpressionParser PARSER = new SpelExpressionParser();
+ static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
  /**
  * Creates a {@link RepositoryQuery} from the given {@link String} query.

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java

@@ -162,7 +162,7 @@ private void assertParameterNamesInAnnotatedQuery() {
 
  String annotatedQuery = getAnnotatedQuery();
 
- if (!DeclaredQuery.of(annotatedQuery, this.isNativeQuery.get()).hasNamedParameter()) {
+ if (!DeclaredQuery.of(annotatedQuery, this.isNativeQuery.get(), this.getEntityInformation(), JpaQueryFactory.PARSER).hasNamedParameter()) {
  return;
  }
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

@@ -1073,6 +1073,14 @@ void shouldSupportModifyingQueryWithVarArgs() {
  assertThat(repository.findByActiveTrue()).isEmpty();
  }
 
+ @Test // GH-3096
+ void shouldSupportNativeQueriesWithSpEL() {
+
+ flushTestUsers();
+
+ assertThat(repository.nativeQueryWithSpEL()).containsExactly(firstUser, secondUser, thirdUser, fourthUser);
+ }
+
  @Test // DATAJPA-405
  void executesFinderWithOrderClauseOnly() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQueryUnitTests.java

@@ -106,15 +106,15 @@ void shouldDetectComplexNativeQueriesWithSpelAsNonNative() {
  + "AND (n.updatedAt >= ?#{#networkRequest.updatedTime.startDateTime}) AND (n.updatedAt <=?#{#networkRequest.updatedTime.endDateTime})",
  metadata, SPEL_PARSER, true);
 
- assertThat(query.isNativeQuery()).isFalse();
+ assertThat(query.isNativeQuery()).isTrue();
  }
 
  @Test
  void shouldDetectSimpleNativeQueriesWithSpelAsNonNative() {
 
  StringQuery query = new ExpressionBasedStringQuery("select n from #{#entityName} n", metadata, SPEL_PARSER, true);
 
- assertThat(query.isNativeQuery()).isFalse();
+ assertThat(query.isNativeQuery()).isTrue();
  }
 
  @Test

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

@@ -734,6 +734,10 @@ List<String> findAllAndSortByFunctionResultNamedParameter(@Param("namedParameter
  @Query("select u from User u where u.firstname >= (select Min(u0.firstname) from User u0)")
  List<NameOnly> findProjectionBySubselect();
 
+ // GH-3096
+ @Query(value = "select * from SD_User as #{#entityName}", nativeQuery = true)
+ List<User> nativeQueryWithSpEL();
+
  Window<User> findBy(OffsetScrollPosition position);
 
  interface RolesAndFirstname {