From 92f91a85dbd3dcd87e7354fc72baba6f988c37e5 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 5 Dec 2017 17:31:35 +0100 Subject: [PATCH] DATAJPA-1233 - Polishing. Cleaned up JavaDoc. Removed superfluous modifiers and initialisation code. --- .../data/jpa/repository/query/NamedQuery.java | 8 +++++--- .../jpa/repository/query/ParameterBinderUnitTests.java | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java index ee7984288..739660e63 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java @@ -87,7 +87,8 @@ final class NamedQuery extends AbstractJpaQuery { /** * Returns whether the named query with the given name exists. * - * @param em + * @param em must not be {@literal null}. + * @param queryName must not be {@literal null}. * @return */ private static boolean hasNamedQuery(EntityManager em, String queryName) { @@ -112,7 +113,8 @@ final class NamedQuery extends AbstractJpaQuery { /** * Looks up a named query for the given {@link org.springframework.data.repository.query.QueryMethod}. * - * @param method + * @param method must not be {@literal null}. + * @param em must not be {@literal null}. * @return */ @Nullable @@ -154,7 +156,7 @@ final class NamedQuery extends AbstractJpaQuery { protected TypedQuery doCreateCountQuery(Object[] values) { EntityManager em = getEntityManager(); - TypedQuery countQuery = null; + TypedQuery countQuery; if (namedCountQueryIsPresent) { countQuery = em.createNamedQuery(countQueryName, Long.class); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java index 50c1ece5f..06d50bada 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java @@ -72,12 +72,10 @@ public class ParameterBinderUnitTests { } - static interface SampleRepository { + interface SampleRepository { User useIndexedParameters(String lastname); - User indexedParameterWithSort(String lastname, Sort sort); - User valid(@Param("username") String username); User validWithPageable(@Param("username") String username, Pageable pageable);