diff --git a/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java
index 818b6f55b..60b4906f8 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java
@@ -18,7 +18,7 @@ package org.springframework.data.jpa.repository.query;
 import java.util.List;
 
 import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * A wrapper for a String representation of a query offering information about the query.
@@ -35,7 +35,7 @@ interface DeclaredQuery {
 	 * @return a {@literal DeclaredQuery} instance even for a {@literal null} or empty argument.
 	 */
 	static DeclaredQuery of(@Nullable String query) {
-		return StringUtils.isEmpty(query) ? EmptyDeclaredQuery.EMPTY_QUERY : new StringQuery(query);
+		return ObjectUtils.isEmpty(query) ? EmptyDeclaredQuery.EMPTY_QUERY : new StringQuery(query);
 	}
 
 	/**
@@ -77,7 +77,7 @@ interface DeclaredQuery {
 	 * Creates a new {@literal DeclaredQuery} representing a count query, i.e. a query returning the number of rows to be
 	 * expected from the original query, either derived from the query wrapped by this instance or from the information
 	 * passed as arguments.
-	 * 
+	 *
 	 * @param countQuery an optional query string to be used if present.
 	 * @param countQueryProjection an optional return type for the query.
 	 * @return a new {@literal DeclaredQuery} instance.
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java
index 7b5c39ef9..d8f276c0d 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java
@@ -62,7 +62,6 @@ class StoredProcedureJpaQuery extends AbstractJpaQuery {
 		super(method, em);
 		this.procedureAttributes = method.getProcedureAttributes();
 		this.useNamedParameters = useNamedParameters(method);
-
 	}
 
 	/**
@@ -204,7 +203,7 @@ class StoredProcedureJpaQuery extends AbstractJpaQuery {
 
 			ProcedureParameter procedureOutput = procedureAttributes.getOutputProcedureParameters().get(0);
 
-			/**
+			/*
 			 * If there is a {@link java.sql.ResultSet} with a {@link ParameterMode#REF_CURSOR}, find the output parameter.
 			 * Otherwise, no need, there is no need to find an output parameter.
 			 */
@@ -229,7 +228,7 @@ class StoredProcedureJpaQuery extends AbstractJpaQuery {
 
 	/**
 	 * Does this stored procedure have a {@link java.sql.ResultSet} using {@link ParameterMode#REF_CURSOR}?
-	 * 
+	 *
 	 * @param procedureOutput
 	 * @return
 	 */