Skip to content

Commit 1afc493

Browse files
committed
Rename QueryParser/QueryParsing classes as JpaQueryParser/JpaQueryParsing
To clarify that this feature is JPA-specific, adopt a Jpa prefix (except for concrete situation such as Jpql or Hql specific).
1 parent c35c914 commit 1afc493

17 files changed

+1129
-1138
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import org.springframework.lang.Nullable;
2525

2626
/**
27-
* Implements the parsing operations of a {@link QueryParser} using the ANTLR-generated {@link HqlParser} and
27+
* Implements the parsing operations of a {@link JpaQueryParser} using the ANTLR-generated {@link HqlParser} and
2828
* {@link HqlQueryTransformer}.
2929
*
3030
* @author Greg Turnquist
3131
* @since 3.1
3232
*/
33-
class HqlQueryParser extends QueryParser {
33+
class HqlQueryParser extends JpaQueryParser {
3434

3535
HqlQueryParser(DeclaredQuery declaredQuery) {
3636
super(declaredQuery);
@@ -41,7 +41,7 @@ class HqlQueryParser extends QueryParser {
4141
}
4242

4343
/**
44-
* Convenience method to parse an HQL query. Will throw a {@link QueryParsingSyntaxError} if the query is invalid.
44+
* Convenience method to parse an HQL query. Will throw a {@link JpaQueryParsingSyntaxError} if the query is invalid.
4545
*
4646
* @param query
4747
* @return a parsed query, ready for postprocessing
@@ -51,7 +51,7 @@ static ParserRuleContext parse(String query) {
5151
HqlLexer lexer = new HqlLexer(CharStreams.fromString(query));
5252
HqlParser parser = new HqlParser(new CommonTokenStream(lexer));
5353

54-
parser.addErrorListener(new QueryParsingSyntaxErrorListener());
54+
parser.addErrorListener(new JpaQueryParsingSyntaxErrorListener());
5555

5656
return parser.start();
5757
}
@@ -71,10 +71,10 @@ ParserRuleContext parse() {
7171
*
7272
* @param parsedQuery
7373
* @param sort can be {@literal null}
74-
* @return list of {@link QueryParsingToken}s
74+
* @return list of {@link JpaQueryParsingToken}s
7575
*/
7676
@Override
77-
List<QueryParsingToken> doCreateQuery(ParserRuleContext parsedQuery, Sort sort) {
77+
List<JpaQueryParsingToken> doCreateQuery(ParserRuleContext parsedQuery, Sort sort) {
7878
return new HqlQueryTransformer(sort).visit(parsedQuery);
7979
}
8080

@@ -83,10 +83,10 @@ List<QueryParsingToken> doCreateQuery(ParserRuleContext parsedQuery, Sort sort)
8383
*
8484
* @param parsedQuery
8585
* @param countProjection
86-
* @return list of {@link QueryParsingToken}s
86+
* @return list of {@link JpaQueryParsingToken}s
8787
*/
8888
@Override
89-
List<QueryParsingToken> doCreateCountQuery(ParserRuleContext parsedQuery, @Nullable String countProjection) {
89+
List<JpaQueryParsingToken> doCreateCountQuery(ParserRuleContext parsedQuery, @Nullable String countProjection) {
9090
return new HqlQueryTransformer(true, countProjection).visit(parsedQuery);
9191
}
9292

@@ -111,7 +111,7 @@ String findAlias(ParserRuleContext parsedQuery) {
111111
* @return
112112
*/
113113
@Override
114-
List<QueryParsingToken> doFindProjection(ParserRuleContext parsedQuery) {
114+
List<JpaQueryParsingToken> doFindProjection(ParserRuleContext parsedQuery) {
115115

116116
HqlQueryTransformer transformVisitor = new HqlQueryTransformer();
117117
transformVisitor.visit(parsedQuery);

0 commit comments

Comments
 (0)