Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1370 - Avoid premature String concatenation in SimpleJpaQuery.

Browse Source 
SimpleJpaQuery now avoids potentially unnecessary String.format(…) invocations for actually valid queries and only performs them in case of an actual verification failure.
This commit is contained in:
Oliver Gierke
2018-07-04 23:09:36 +02:00
parent e752422c09
commit 612852d3ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
View File

@@ -60,7 +60,7 @@ final class SimpleJpaQuery extends AbstractStringBasedJpaQuery {
super(method, em, queryString, evaluationContextProvider, parser);
validateQuery(getQuery().getQueryString(), String.format("Validation failed for query for method %s!", method));
validateQuery(getQuery().getQueryString(), "Validation failed for query for method %s!", method);
if (method.isPageQuery()) {
validateQuery(getCountQuery().getQueryString(),
@@ -74,7 +74,7 @@ final class SimpleJpaQuery extends AbstractStringBasedJpaQuery {
* @param query
* @param errorMessage
*/
private void validateQuery(String query, String errorMessage) {
private void validateQuery(String query, String errorMessage, Object... arguments) {
if (getQueryMethod().isProcedureQuery()) {
return;
@@ -90,7 +90,7 @@ final class SimpleJpaQuery extends AbstractStringBasedJpaQuery {
// Needed as there's ambiguities in how an invalid query string shall be expressed by the persistence provider
// http://java.net/projects/jpa-spec/lists/jsr338-experts/archive/2012-07/message/17
throw new IllegalArgumentException(errorMessage, e);
throw new IllegalArgumentException(String.format(errorMessage, arguments), e);
} finally {