diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java
index e950a50c8..5d6a35a10 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java
@@ -26,25 +26,22 @@ import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.jdbc.core.RowMapper;
/**
- *
* Annotation to provide SQL statements that will get used for executing the method. The SQL statement may contain named
* parameters as supported by {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}. Those
* parameters will get bound to the arguments of the annotated method.
- *
+ *
* You can also specify the way to extract data from {@link java.sql.ResultSet}. There are 4 attribute of this
* annotation you can set to do that:
*
*
- * - {@link #resultSetExtractorRef()}
- *
- {@link #resultSetExtractorClass()}
- *
- {@link #rowMapperRef()}
- *
- {@link #rowMapperClass()}
- *
- *
- *
+ * {@link #resultSetExtractorRef()}
+ * {@link #resultSetExtractorClass()}
+ * {@link #rowMapperRef()}
+ * {@link #rowMapperClass()}
+ *
* The annotation attributes above are listed in their preference order, that is - the {@link #resultSetExtractorRef()},
- * has the highest privilege and, will suppress any other 3 attribute from above, and consequently {@link #rowMapperClass()}
- * has the lowest privilege and will be used if any of three above are not specified.
+ * has the highest privilege and, will suppress any other 3 attribute from above, and consequently
+ * {@link #rowMapperClass()} has the lowest privilege and will be used if any of three above are not specified.
*
* @author Jens Schauder
* @author Moises Cisneros
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/DefaultRowMapperFactory.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/DefaultRowMapperFactory.java
index 8a86659cc..afc490446 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/DefaultRowMapperFactory.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/DefaultRowMapperFactory.java
@@ -30,8 +30,9 @@ import org.springframework.util.Assert;
*
* This implementation is not capable of loading the {@link RowMapper} or {@link ResultSetExtractor} by reference via
* corresponding methods from {@link RowMapperFactory}.
+ *
+ * Implementation is thread-safe.
*
- * @implNote Public APIs of this class are thread-safe.
* @author Mikhail Polivakha
* @since 4.0
*/