Skip to content

Commit 648bd74

Browse files
committed
Polishing.
Move off deprecated API. See #2319
1 parent fa11454 commit 648bd74

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.List;
1919

2020
import org.springframework.lang.Nullable;
21-
import org.springframework.util.StringUtils;
21+
import org.springframework.util.ObjectUtils;
2222

2323
/**
2424
* A wrapper for a String representation of a query offering information about the query.
@@ -35,7 +35,7 @@ interface DeclaredQuery {
3535
* @return a {@literal DeclaredQuery} instance even for a {@literal null} or empty argument.
3636
*/
3737
static DeclaredQuery of(@Nullable String query) {
38-
return StringUtils.isEmpty(query) ? EmptyDeclaredQuery.EMPTY_QUERY : new StringQuery(query);
38+
return ObjectUtils.isEmpty(query) ? EmptyDeclaredQuery.EMPTY_QUERY : new StringQuery(query);
3939
}
4040

4141
/**
@@ -77,7 +77,7 @@ static DeclaredQuery of(@Nullable String query) {
7777
* Creates a new {@literal DeclaredQuery} representing a count query, i.e. a query returning the number of rows to be
7878
* expected from the original query, either derived from the query wrapped by this instance or from the information
7979
* passed as arguments.
80-
*
80+
*
8181
* @param countQuery an optional query string to be used if present.
8282
* @param countQueryProjection an optional return type for the query.
8383
* @return a new {@literal DeclaredQuery} instance.

src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class StoredProcedureJpaQuery extends AbstractJpaQuery {
6262
super(method, em);
6363
this.procedureAttributes = method.getProcedureAttributes();
6464
this.useNamedParameters = useNamedParameters(method);
65-
6665
}
6766

6867
/**
@@ -204,7 +203,7 @@ private StoredProcedureQuery newAdhocStoredProcedureQuery() {
204203

205204
ProcedureParameter procedureOutput = procedureAttributes.getOutputProcedureParameters().get(0);
206205

207-
/**
206+
/*
208207
* If there is a {@link java.sql.ResultSet} with a {@link ParameterMode#REF_CURSOR}, find the output parameter.
209208
* Otherwise, no need, there is no need to find an output parameter.
210209
*/
@@ -229,7 +228,7 @@ private StoredProcedureQuery newAdhocStoredProcedureQuery() {
229228

230229
/**
231230
* Does this stored procedure have a {@link java.sql.ResultSet} using {@link ParameterMode#REF_CURSOR}?
232-
*
231+
*
233232
* @param procedureOutput
234233
* @return
235234
*/

0 commit comments

Comments
 (0)