DATAJPA-1654 - Ensure repositories in tests declare the correct ID type.

Author: SergiiTsypanov

src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedCustomizedUserRepository.java

@@ -22,7 +22,7 @@
  * @author Mark Paluch
  */
 @UserDB
-public interface QualifiedCustomizedUserRepository extends Repository<User, Long>,
+public interface QualifiedCustomizedUserRepository extends Repository<User, Integer>,
 		QualifiedCustomizedUserRepositoryCustom, QualifiedFragment {
 
 }

src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java

@@ -70,7 +70,7 @@ public void distinctFlagOnCountQueryIssuesCountDistinct() throws Exception {
 		assertThat(HibernateUtils.getHibernateQuery(query)).startsWith("select distinct count(distinct");
 	}
 
-	interface SomeRepository extends Repository<User, Long> {
+	interface SomeRepository extends Repository<User, Integer> {
 		void findDistinctByRolesIn(List<Role> roles);
 	}
 }

src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java

@@ -102,7 +102,7 @@ public void sholdThrowMorePreciseExceptionIfTryingToUsePaginationInNativeQueries
 				.withMessageContaining(method.toString());
 	}
 
-	interface UserRepository extends Repository<User, Long> {
+	interface UserRepository extends Repository<User, Integer> {
 
 		@Query("something absurd")
 		User findByFoo(String foo);

src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java

@@ -66,7 +66,6 @@
 @RunWith(MockitoJUnitRunner.class)
 public class JpaQueryMethodUnitTests {
 
-	static final Class<?> DOMAIN_CLASS = User.class;
 	static final String METHOD_NAME = "findByFirstname";
 
 	@Mock QueryExtractor extractor;
@@ -328,7 +327,7 @@ public void shouldFindEntityGraphAnnotationOnOverriddenSimpleJpaRepositoryMethod
 		doReturn(User.class).when(metadata).getDomainType();
 		doReturn(User.class).when(metadata).getReturnedDomainClass((Method) any());
 
-		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("findOne", Long.class), metadata,
+		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("findOne", Integer.class), metadata,
 				factory, extractor);
 
 		assertThat(method.getEntityGraph()).isNotNull();
@@ -345,7 +344,7 @@ public void shouldFindEntityGraphAnnotationOnQueryMethodGetOneByWithDerivedName(
 		doReturn(User.class).when(metadata).getDomainType();
 		doReturn(User.class).when(metadata).getReturnedDomainClass((Method) any());
 
-		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("getOneById", Long.class),
+		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("getOneById", Integer.class),
 				metadata, factory, extractor);
 
 		assertThat(method.getEntityGraph()).isNotNull();
@@ -469,7 +468,7 @@ public void usesAliasedValueForEntityGraph() throws Exception {
 	 *
 	 * @author Oliver Gierke
 	 */
-	static interface InvalidRepository extends Repository<User, Long> {
+	interface InvalidRepository extends Repository<User, Integer> {
 
 		// Invalid return type
 		User findByFirstname(String firstname, Pageable pageable);
@@ -500,7 +499,7 @@ static interface InvalidRepository extends Repository<User, Long> {
 		List<User> findByAnnotatedQuery(@Param("param") String param);
 	}
 
-	static interface ValidRepository extends Repository<User, Long> {
+	interface ValidRepository extends Repository<User, Integer> {
 
 		@Query(value = "query", nativeQuery = true)
 		List<User> findByLastname(String lastname);
@@ -530,7 +529,7 @@ static interface ValidRepository extends Repository<User, Long> {
 		void withMetaAnnotationUsingAliasFor();
 	}
 
-	static interface JpaRepositoryOverride extends JpaRepository<User, Long> {
+	interface JpaRepositoryOverride extends JpaRepository<User, Integer> {
 
 		/**
 		 * DATAJPA-612
@@ -543,13 +542,13 @@ static interface JpaRepositoryOverride extends JpaRepository<User, Long> {
 		 * DATAJPA-689
 		 */
 		@EntityGraph("User.detail")
-		Optional<User> findOne(Long id);
+		Optional<User> findOne(Integer id);
 
 		/**
 		 * DATAJPA-696
 		 */
 		@EntityGraph
-		User getOneById(Long id);
+		User getOneById(Integer id);
 
 		@CustomComposedEntityGraphAnnotationWithAliasFor
 		User getOneWithCustomEntityGraphAnnotation();

src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java

@@ -22,6 +22,7 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -242,7 +243,7 @@ private static boolean isHibernate5() {
 	}
 
 	@SuppressWarnings("unused")
-	interface UserRepository extends Repository<User, Long> {
+	interface UserRepository extends Repository<User, Integer> {
 
 		Page<User> findByFirstname(String firstname, Pageable pageable);
 
@@ -260,6 +261,15 @@ interface UserRepository extends Repository<User, Long> {
 
 		List<User> findByFirstnameIsEmpty();
 
+		// should fail, since we can't compare scalar values to collections
+		List<User> findById(Collection<Long> ids);
+
+		// should fail, since we can't do an IN on a scalar
+		List<User> findByIdIn(Long id);
+
+		// should succeed
+		List<User> findByFirstnameIn(Iterable<String> id);
+
 		// Wrong number of parameters
 		User findByFirstname();
 

src/test/java/org/springframework/data/jpa/repository/sample/AuditableUserRepository.java

@@ -28,7 +28,7 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  */
-public interface AuditableUserRepository extends JpaRepository<AuditableUser, Long> {
+public interface AuditableUserRepository extends JpaRepository<AuditableUser, Integer> {
 
 	/**
 	 * Returns all users with the given firstname.

src/test/java/org/springframework/data/jpa/repository/sample/DummyRepository.java

@@ -23,7 +23,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-public interface DummyRepository extends CrudRepository<Dummy, Long> {
+public interface DummyRepository extends CrudRepository<Dummy, Integer> {
 
 	@Procedure("procedure_in1_out1")
 	Integer adHocProcedureWith1InputAnd1OutputParameter(Integer in);

src/test/java/org/springframework/data/jpa/repository/sample/RedeclaringRepositoryMethodsRepository.java

@@ -29,7 +29,7 @@
  *
  * @author Thomas Darimont
  */
-public interface RedeclaringRepositoryMethodsRepository extends CrudRepository<User, Long> {
+public interface RedeclaringRepositoryMethodsRepository extends CrudRepository<User, Integer> {
 
 	/**
 	 * Should not find any users at all.

src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java

@@ -46,7 +46,7 @@ public class JpaEntityInformationSupportUnitTests {
 	@Test
 	public void usesSimpleClassNameIfNoEntityNameGiven() throws Exception {
 
-		JpaEntityInformation<User, Long> information = new DummyJpaEntityInformation<User, Long>(User.class);
+		JpaEntityInformation<User, Integer> information = new DummyJpaEntityInformation<>(User.class);
 		assertThat(information.getEntityName()).isEqualTo("User");
 
 		JpaEntityInformation<NamedUser, ?> second = new DummyJpaEntityInformation<NamedUser, Serializable>(NamedUser.class);

src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java

@@ -57,7 +57,7 @@ public class SimpleJpaRepositoryUnitTests {
 	@Mock CriteriaQuery<Long> countCriteriaQuery;
 	@Mock TypedQuery<User> query;
 	@Mock TypedQuery<Long> countQuery;
-	@Mock JpaEntityInformation<User, Long> information;
+	@Mock JpaEntityInformation<User, Integer> information;
 	@Mock CrudMethodMetadata metadata;
 	@Mock EntityGraph<User> entityGraph;
 	@Mock org.springframework.data.jpa.repository.EntityGraph entityGraphAnnotation;