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 4dd10a8a4..77aa89afd 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2017 the original author or authors.
+ * Copyright 2008-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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<Long> doCreateCountQuery(Object[] values) {
 
 		EntityManager em = getEntityManager();
-		TypedQuery<Long> countQuery = null;
+		TypedQuery<Long> 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 5f9aab0d7..9c17d895b 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);