diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java
index 3680cc99f..384cf4bfd 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -76,13 +76,14 @@ import org.springframework.util.MethodInvoker;
  *
  * @author Michael Minella
  * @author Antoine Kapps
+ * @author Mahmoud Ben Hassine
  * @since 2.2
  */
 public class RepositoryItemReader<T> extends AbstractItemCountingItemStreamItemReader<T> implements InitializingBean {
 
 	protected Log logger = LogFactory.getLog(getClass());
 
-	private PagingAndSortingRepository<?, ?> repository;
+	private PagingAndSortingRepository<T, ?> repository;
 
 	private Sort sort;
 
@@ -132,7 +133,7 @@ public class RepositoryItemReader<T> extends AbstractItemCountingItemStreamItemR
 	 * implementation used to read input from.
 	 * @param repository underlying repository for input to be read from.
 	 */
-	public void setRepository(PagingAndSortingRepository<?, ?> repository) {
+	public void setRepository(PagingAndSortingRepository<T, ?> repository) {
 		this.repository = repository;
 	}
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java
index 50098723f..df84fce5c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
  */
 public class RepositoryItemReaderBuilder<T> {
 
-	private PagingAndSortingRepository<?, ?> repository;
+	private PagingAndSortingRepository<T, ?> repository;
 
 	private Map<String, Sort.Direction> sorts;
 
@@ -165,7 +165,7 @@ public class RepositoryItemReaderBuilder<T> {
 	 * @return The current instance of the builder.
 	 * @see RepositoryItemReader#setRepository(PagingAndSortingRepository)
 	 */
-	public RepositoryItemReaderBuilder<T> repository(PagingAndSortingRepository<?, ?> repository) {
+	public RepositoryItemReaderBuilder<T> repository(PagingAndSortingRepository<T, ?> repository) {
 		this.repository = repository;
 
 		return this;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java
index 459c4e334..4a4ec0b5f 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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.
@@ -343,7 +343,7 @@ public class RepositoryItemReaderTests {
 		assertEquals("3", reader.read());
 	}
 
-	public interface TestRepository extends PagingAndSortingRepository<Map, Long> {
+	public interface TestRepository extends PagingAndSortingRepository<String, Long> {
 
 		Page<String> findFirstNames(Pageable pageable);