diff --git a/src/main/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConverters.java b/src/main/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConverters.java
index 255ff72c917..6ad0c638ad8 100644
--- a/src/main/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConverters.java
+++ b/src/main/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConverters.java
@@ -108,6 +108,7 @@ public Instant convertToEntityAttribute(Date date) {
 	@Converter(autoApply = true)
 	public static class ZoneIdConverter implements AttributeConverter<ZoneId, String> {
 
+		@Override
 		public String convertToDatabaseColumn(ZoneId zoneId) {
 			return ZoneIdToStringConverter.INSTANCE.convert(zoneId);
 		}
diff --git a/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java b/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
index 648aa12cf9f..2f83f1ca2d3 100644
--- a/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
+++ b/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
@@ -47,6 +47,7 @@ public abstract class AbstractPersistable<PK extends Serializable> implements Pe
 	 * @see org.springframework.data.domain.Persistable#getId()
 	 */
 	@Nullable
+	@Override
 	public PK getId() {
 		return id;
 	}
@@ -66,6 +67,7 @@ protected void setId(@Nullable PK id) {
 	 * @see org.springframework.data.domain.Persistable#isNew()
 	 */
 	@Transient // DATAJPA-622
+	@Override
 	public boolean isNew() {
 		return null == getId();
 	}
diff --git a/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java b/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
index 3b889e63d96..9c9887f2ee3 100644
--- a/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
+++ b/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
@@ -59,6 +59,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
 			Collections.singletonList(HIBERNATE_ENTITY_MANAGER_INTERFACE), //
 			Collections.singletonList(HIBERNATE_JPA_METAMODEL_TYPE)) {
 
+		@Override
 		public String extractQueryString(Query query) {
 			return HibernateUtils.getHibernateQuery(query);
 		}
@@ -119,6 +120,7 @@ public CloseableIterator<Object> executeQueryWithResultStream(Query jpaQuery) {
 	ECLIPSELINK(Collections.singleton(ECLIPSELINK_ENTITY_MANAGER_INTERFACE),
 			Collections.singleton(ECLIPSELINK_JPA_METAMODEL_TYPE)) {
 
+		@Override
 		public String extractQueryString(Query query) {
 			return ((JpaQuery<?>) query).getDatabaseQuery().getJPQLString();
 		}
@@ -307,6 +309,7 @@ public String getCountQueryPlaceholder() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.query.QueryExtractor#canExtractQuery()
 	 */
+	@Override
 	public boolean canExtractQuery() {
 		return true;
 	}
diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
index d3332d72ea4..d2def8ff8e4 100644
--- a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
+++ b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
@@ -39,24 +39,28 @@ public interface JpaRepository<T, ID> extends PagingAndSortingRepository<T, ID>,
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findAll()
 	 */
+	@Override
 	List<T> findAll();
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
 	 */
+	@Override
 	List<T> findAll(Sort sort);
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
 	 */
+	@Override
 	List<T> findAllById(Iterable<ID> ids);
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
 	 */
+	@Override
 	<S extends T> List<S> saveAll(Iterable<S> entities);
 
 	/**
diff --git a/src/main/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.java b/src/main/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.java
index bfc6c29afc2..6262d9c2e28 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.java
@@ -48,6 +48,7 @@ public class AuditingBeanDefinitionParser implements BeanDefinitionParser {
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
 	 */
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parser) {
 
 		springConfiguredParser.parse(element, parser);
@@ -92,6 +93,7 @@ private static class SpringConfiguredBeanDefinitionParser implements BeanDefinit
 
 		private static final String BEAN_CONFIGURER_ASPECT_CLASS_NAME = "org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect";
 
+		@Override
 		public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 			if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {
diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java
index 4593bbc6d1a..01f84f60cea 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java
@@ -202,6 +202,7 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConf
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getConfigurationInspectionClassLoader(org.springframework.core.io.ResourceLoader)
 	 */
+	@Override
 	protected ClassLoader getConfigurationInspectionClassLoader(ResourceLoader loader) {
 
 		ClassLoader classLoader = loader.getClassLoader();
diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryNameSpaceHandler.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryNameSpaceHandler.java
index 8781125c181..07065ce3a34 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryNameSpaceHandler.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryNameSpaceHandler.java
@@ -31,6 +31,7 @@ public class JpaRepositoryNameSpaceHandler extends NamespaceHandlerSupport {
 	 *
 	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
 	 */
+	@Override
 	public void init() {
 
 		RepositoryConfigurationExtension extension = new JpaRepositoryConfigExtension();
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java
index 9691b531c78..7e5c480b61f 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java
@@ -77,6 +77,7 @@ class NamedOrIndexedQueryParameterSetter implements QueryParameterSetter {
 		 * @see org.springframework.data.jpa.repository.query.QueryParameterSetter#setParameter(javax.persistence.Query, java.lang.Object[])
 		 */
 		@SuppressWarnings("unchecked")
+		@Override
 		public void setParameter(Query query, Object[] values, ErrorHandling errorHandling) {
 
 			Object value = valueExtractor.apply(values);
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java b/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java
index 72fdafb7a01..5c9ab07a03b 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java
@@ -108,6 +108,7 @@ enum CrudMethodMetadataPopulatingMethodInterceptor implements MethodInterceptor
 		 * (non-Javadoc)
 		 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
 		 */
+		@Override
 		public Object invoke(MethodInvocation invocation) throws Throwable {
 
 			Method method = invocation.getMethod();
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java
index bd01e785717..6809e752ee6 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java
@@ -71,6 +71,7 @@ public JpaEntityInformationSupport(Class<T> domainClass) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.support.JpaEntityMetadata#getEntityName()
 	 */
+	@Override
 	public String getEntityName() {
 		return metadata.getEntityName();
 	}
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
index 7723e64a89e..9f6a347e4fd 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
@@ -144,6 +144,7 @@ public String getEntityName() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.EntityInformation#getId(java.lang.Object)
 	 */
+	@Override
 	@Nullable
 	@SuppressWarnings("unchecked")
 	public ID getId(T entity) {
@@ -174,6 +175,7 @@ public ID getId(T entity) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.EntityInformation#getIdType()
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public Class<ID> getIdType() {
 		return (Class<ID>) idMetadata.getType();
@@ -183,6 +185,7 @@ public Class<ID> getIdType() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getIdAttribute()
 	 */
+	@Override
 	public SingularAttribute<? super T, ?> getIdAttribute() {
 		return idMetadata.getSimpleIdAttribute();
 	}
@@ -191,6 +194,7 @@ public Class<ID> getIdType() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#hasCompositeId()
 	 */
+	@Override
 	public boolean hasCompositeId() {
 		return !idMetadata.hasSimpleId();
 	}
@@ -199,6 +203,7 @@ public boolean hasCompositeId() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getIdAttributeNames()
 	 */
+	@Override
 	public Iterable<String> getIdAttributeNames() {
 
 		List<String> attributeNames = new ArrayList<String>(idMetadata.attributes.size());
@@ -214,6 +219,7 @@ public Iterable<String> getIdAttributeNames() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getCompositeIdAttributeValue(java.lang.Object, java.lang.String)
 	 */
+	@Override
 	public Object getCompositeIdAttributeValue(Object id, String idAttribute) {
 
 		Assert.isTrue(hasCompositeId(), "Model must have a composite Id!");
@@ -306,6 +312,7 @@ private static Class<?> fallbackIdTypeLookup(IdentifiableType<?> type) {
 		 * (non-Javadoc)
 		 * @see java.lang.Iterable#iterator()
 		 */
+		@Override
 		public Iterator<SingularAttribute<? super T, ?>> iterator() {
 			return attributes.iterator();
 		}
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java
index 7b23eab76e4..babdcf03d82 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java
@@ -76,7 +76,7 @@ public void setMappingContext(MappingContext<?, ?> mappingContext) {
 	/**
 	 * Configures the {@link EntityPathResolver} to be used. Will expect a canonical bean to be present but fallback to
 	 * {@link SimpleEntityPathResolver#INSTANCE} in case none is available.
-	 * 
+	 *
 	 * @param resolver must not be {@literal null}.
 	 */
 	@Autowired
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
index d92183c92b5..13b6e8df7e9 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -114,6 +114,7 @@ public SimpleJpaRepository(Class<T> domainClass, EntityManager em) {
 	 *
 	 * @param crudMethodMetadata
 	 */
+	@Override
 	public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
 		this.metadata = crudMethodMetadata;
 	}
@@ -142,6 +143,7 @@ private String getCountQueryString() {
 	 * @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable)
 	 */
 	@Transactional
+	@Override
 	public void deleteById(ID id) {
 
 		Assert.notNull(id, ID_MUST_NOT_BE_NULL);
@@ -155,6 +157,7 @@ public void deleteById(ID id) {
 	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
 	 */
 	@Transactional
+	@Override
 	public void delete(T entity) {
 
 		Assert.notNull(entity, "The entity must not be null!");
@@ -166,6 +169,7 @@ public void delete(T entity) {
 	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
 	 */
 	@Transactional
+	@Override
 	public void deleteAll(Iterable<? extends T> entities) {
 
 		Assert.notNull(entities, "The given Iterable of entities not be null!");
@@ -180,6 +184,7 @@ public void deleteAll(Iterable<? extends T> entities) {
 	 * @see org.springframework.data.jpa.repository.JpaRepository#deleteInBatch(java.lang.Iterable)
 	 */
 	@Transactional
+	@Override
 	public void deleteInBatch(Iterable<T> entities) {
 
 		Assert.notNull(entities, "The given Iterable of entities not be null!");
@@ -197,6 +202,7 @@ public void deleteInBatch(Iterable<T> entities) {
 	 * @see org.springframework.data.repository.Repository#deleteAll()
 	 */
 	@Transactional
+	@Override
 	public void deleteAll() {
 
 		for (T element : findAll()) {
@@ -209,6 +215,7 @@ public void deleteAll() {
 	 * @see org.springframework.data.jpa.repository.JpaRepository#deleteAllInBatch()
 	 */
 	@Transactional
+	@Override
 	public void deleteAllInBatch() {
 		em.createQuery(getDeleteAllQueryString()).executeUpdate();
 	}
@@ -217,6 +224,7 @@ public void deleteAllInBatch() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findById(java.io.Serializable)
 	 */
+	@Override
 	public Optional<T> findById(ID id) {
 
 		Assert.notNull(id, ID_MUST_NOT_BE_NULL);
@@ -259,6 +267,7 @@ public T getOne(ID id) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#existsById(java.io.Serializable)
 	 */
+	@Override
 	public boolean existsById(ID id) {
 
 		Assert.notNull(id, ID_MUST_NOT_BE_NULL);
@@ -302,6 +311,7 @@ public boolean existsById(ID id) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaRepository#findAll()
 	 */
+	@Override
 	public List<T> findAll() {
 		return getQuery(null, Sort.unsorted()).getResultList();
 	}
@@ -310,6 +320,7 @@ public List<T> findAll() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
 	 */
+	@Override
 	public List<T> findAllById(Iterable<ID> ids) {
 
 		Assert.notNull(ids, "The given Iterable of Id's must not be null!");
@@ -339,6 +350,7 @@ public List<T> findAllById(Iterable<ID> ids) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaRepository#findAll(org.springframework.data.domain.Sort)
 	 */
+	@Override
 	public List<T> findAll(Sort sort) {
 		return getQuery(null, sort).getResultList();
 	}
@@ -347,6 +359,7 @@ public List<T> findAll(Sort sort) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
 	 */
+	@Override
 	public Page<T> findAll(Pageable pageable) {
 
 		if (isUnpaged(pageable)) {
@@ -360,6 +373,7 @@ public Page<T> findAll(Pageable pageable) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findOne(org.springframework.data.jpa.domain.Specification)
 	 */
+	@Override
 	public Optional<T> findOne(@Nullable Specification<T> spec) {
 
 		try {
@@ -373,6 +387,7 @@ public Optional<T> findOne(@Nullable Specification<T> spec) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findAll(org.springframework.data.jpa.domain.Specification)
 	 */
+	@Override
 	public List<T> findAll(@Nullable Specification<T> spec) {
 		return getQuery(spec, Sort.unsorted()).getResultList();
 	}
@@ -381,6 +396,7 @@ public List<T> findAll(@Nullable Specification<T> spec) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findAll(org.springframework.data.jpa.domain.Specification, org.springframework.data.domain.Pageable)
 	 */
+	@Override
 	public Page<T> findAll(@Nullable Specification<T> spec, Pageable pageable) {
 
 		TypedQuery<T> query = getQuery(spec, pageable);
@@ -392,6 +408,7 @@ public Page<T> findAll(@Nullable Specification<T> spec, Pageable pageable) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findAll(org.springframework.data.jpa.domain.Specification, org.springframework.data.domain.Sort)
 	 */
+	@Override
 	public List<T> findAll(@Nullable Specification<T> spec, Sort sort) {
 		return getQuery(spec, sort).getResultList();
 	}
@@ -466,6 +483,7 @@ public <S extends T> Page<S> findAll(Example<S> example, Pageable pageable) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#count()
 	 */
+	@Override
 	public long count() {
 		return em.createQuery(getCountQueryString(), Long.class).getSingleResult();
 	}
@@ -474,6 +492,7 @@ public long count() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#count(org.springframework.data.jpa.domain.Specification)
 	 */
+	@Override
 	public long count(@Nullable Specification<T> spec) {
 		return executeCountQuery(getCountQuery(spec, getDomainClass()));
 	}
@@ -483,6 +502,7 @@ public long count(@Nullable Specification<T> spec) {
 	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
 	 */
 	@Transactional
+	@Override
 	public <S extends T> S save(S entity) {
 
 		if (entityInformation.isNew(entity)) {
@@ -498,6 +518,7 @@ public <S extends T> S save(S entity) {
 	 * @see org.springframework.data.jpa.repository.JpaRepository#saveAndFlush(java.lang.Object)
 	 */
 	@Transactional
+	@Override
 	public <S extends T> S saveAndFlush(S entity) {
 
 		S result = save(entity);
@@ -511,6 +532,7 @@ public <S extends T> S saveAndFlush(S entity) {
 	 * @see org.springframework.data.jpa.repository.JpaRepository#save(java.lang.Iterable)
 	 */
 	@Transactional
+	@Override
 	public <S extends T> List<S> saveAll(Iterable<S> entities) {
 
 		Assert.notNull(entities, "The given Iterable of entities not be null!");
@@ -529,6 +551,7 @@ public <S extends T> List<S> saveAll(Iterable<S> entities) {
 	 * @see org.springframework.data.jpa.repository.JpaRepository#flush()
 	 */
 	@Transactional
+	@Override
 	public void flush() {
 		em.flush();
 	}
@@ -770,6 +793,7 @@ private static final class ByIdsSpecification<T> implements Specification<T> {
 		 * (non-Javadoc)
 		 * @see org.springframework.data.jpa.domain.Specification#toPredicate(javax.persistence.criteria.Root, javax.persistence.criteria.CriteriaQuery, javax.persistence.criteria.CriteriaBuilder)
 		 */
+		@Override
 		public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 
 			Path<?> path = root.get(entityInformation.getIdAttribute());
diff --git a/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java b/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
index ff30be2f319..b4470e2e3a4 100644
--- a/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
+++ b/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
@@ -95,6 +95,7 @@ public void setMappingFileNamePattern(String mappingFilePattern) {
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader)
 	 */
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 
 		Assert.notNull(resourceLoader, "ResourceLoader must not be null!");
@@ -119,6 +120,7 @@ public void setEnvironment(Environment environment) {
 	 * (non-Javadoc)
 	 * @see org.springframework.orm.jpa.persistenceunit.PersistenceUnitPostProcessor#postProcessPersistenceUnitInfo(org.springframework.orm.jpa.persistenceunit.MutablePersistenceUnitInfo)
 	 */
+	@Override
 	public void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo pui) {
 
 		ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java b/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java
index cc09963f9ef..d37c3a14417 100644
--- a/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java
+++ b/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java
@@ -67,6 +67,7 @@ public Long getSecond() {
 	/* (non-Javadoc)
 	 * @see org.springframework.data.domain.Persistable#getId()
 	 */
+	@Override
 	public PersistableWithIdClassPK getId() {
 		return new PersistableWithIdClassPK(first, second);
 	}
@@ -74,6 +75,7 @@ public PersistableWithIdClassPK getId() {
 	/* (non-Javadoc)
 	 * @see org.springframework.data.domain.Persistable#isNew()
 	 */
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java b/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java
index cb8872de7d1..d3fb582ac86 100644
--- a/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java
+++ b/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java
@@ -61,6 +61,7 @@ public static Specification<User> userHasFirstnameLike(final String expression)
 
 		return new Specification<User>() {
 
+			@Override
 			public Predicate toPredicate(Root<User> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 
 				return cb.like(root.get("firstname").as(String.class), String.format("%%%s%%", expression));
@@ -79,6 +80,7 @@ public static Specification<User> userHasLastnameLikeWithSort(final String expre
 
 		return new Specification<User>() {
 
+			@Override
 			public Predicate toPredicate(Root<User> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 
 				query.orderBy(cb.asc(root.get("firstname")));
@@ -92,6 +94,7 @@ private static <T> Specification<T> simplePropertySpec(final String property, fi
 
 		return new Specification<T>() {
 
+			@Override
 			public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 
 				return builder.equal(root.get(property), value);
diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java
index 3fd400b1faf..ddc9cd060d3 100644
--- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java
@@ -29,33 +29,41 @@ public class EclipseLinkEntityGraphRepositoryMethodsIntegrationTests
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectNamedEntitySubGraph() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectMultipleSubGraphForSameAttributeWithDynamicFetchGraph() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectDynamicFetchGraphForGetOneWithAttributeNamesById() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectConfiguredJpaEntityGraphWithPaginationAndQueryDslPredicates() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectConfiguredJpaEntityGraphWithPaginationAndSpecification() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldCreateDynamicGraphWithMultipleLevelsOfSubgraphs() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectConfiguredJpaEntityGraphInFindOne() {}
 
 	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
+	@Override
 	public void shouldRespectInferFetchGraphFromMethodName() {}
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java
index 311845689de..4c258794fb4 100644
--- a/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java
@@ -63,6 +63,7 @@ public void setUp() {
 	public void testWithoutJoin() throws Exception {
 
 		Page<Parent> page = repository.findAll(new Specification<Parent>() {
+			@Override
 			public Predicate toPredicate(Root<Parent> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				Path<Set<Child>> childrenPath = root.get("children");
 				query.distinct(true);
@@ -82,6 +83,7 @@ public Predicate toPredicate(Root<Parent> root, CriteriaQuery<?> query, Criteria
 	@Test // DATAJPA-287
 	public void testWithJoin() throws Exception {
 		Page<Parent> page = repository.findAll(new Specification<Parent>() {
+			@Override
 			public Predicate toPredicate(Root<Parent> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				root.join("children");
 				// we are interesting in distinct items, especially when join presents in query
diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java
index effdb72ad99..c3c35262131 100644
--- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java
@@ -46,6 +46,7 @@ public CustomGenericJpaRepository(JpaEntityInformation<T, ID> metadata, EntityMa
 	 * org.springframework.data.jpa.repository.custom.CustomGenericRepository
 	 * #customMethod(java.io.Serializable)
 	 */
+	@Override
 	public T customMethod(ID id) {
 
 		throw new UnsupportedOperationException("Forced exception for testing purposes.");
diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/UserCustomExtendedRepository.java b/src/test/java/org/springframework/data/jpa/repository/custom/UserCustomExtendedRepository.java
index cdc25ec1003..16c08fd11ae 100644
--- a/src/test/java/org/springframework/data/jpa/repository/custom/UserCustomExtendedRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/custom/UserCustomExtendedRepository.java
@@ -32,9 +32,11 @@ public interface UserCustomExtendedRepository extends CustomGenericRepository<Us
 	/**
 	 * Sample method to test reconfiguring transactions on CRUD methods in combination with custom factory.
 	 */
+	@Override
 	@Transactional(readOnly = false, timeout = 10)
 	List<User> findAll();
 
+	@Override
 	@Transactional(readOnly = false, timeout = 10)
 	Optional<User> findById(Integer id);
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java
index c31fb48df5c..1acdf5e67aa 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java
@@ -234,6 +234,7 @@ public void doesNotPreemtivelyWrapResultIntoOptional() throws Exception {
 		doReturn(Optional.class).when(method).getReturnType();
 
 		StubQueryExecution execution = new StubQueryExecution() {
+			@Override
 			protected Object doExecute(AbstractJpaQuery query, Object[] values) {
 				return "result";
 			}
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithEmbeddedId.java b/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithEmbeddedId.java
index 4c4a2633b11..30be3b6d49f 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithEmbeddedId.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithEmbeddedId.java
@@ -37,6 +37,7 @@ public interface EmployeeRepositoryWithEmbeddedId
 		extends JpaRepository<EmbeddedIdExampleEmployee, EmbeddedIdExampleEmployeePK>,
 		QuerydslPredicateExecutor<EmbeddedIdExampleEmployee> {
 
+	@Override
 	List<EmbeddedIdExampleEmployee> findAll(Predicate predicate, OrderSpecifier<?>... orders);
 
 	// DATAJPA-920
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithIdClass.java b/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithIdClass.java
index c9b7cad1794..ca7d0edfabb 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithIdClass.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/EmployeeRepositoryWithIdClass.java
@@ -36,6 +36,7 @@
 public interface EmployeeRepositoryWithIdClass extends JpaRepository<IdClassExampleEmployee, IdClassExampleEmployeePK>,
 		QuerydslPredicateExecutor<IdClassExampleEmployee> {
 
+	@Override
 	List<IdClassExampleEmployee> findAll(Predicate predicate, OrderSpecifier<?>... orders);
 
 	// DATAJPA-920
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/MailMessageRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/MailMessageRepository.java
index b495e4d7a7f..5581c830abf 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/MailMessageRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/MailMessageRepository.java
@@ -30,5 +30,6 @@
 public interface MailMessageRepository
 		extends JpaRepository<MailMessage, Long>, QuerydslPredicateExecutor<MailMessage> {
 
+	@Override
 	List<MailMessage> findAll(Predicate predicate, OrderSpecifier<?>... orders);
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/RedeclaringRepositoryMethodsRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/RedeclaringRepositoryMethodsRepository.java
index 11b0da37283..b7a54c96ac9 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/RedeclaringRepositoryMethodsRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/RedeclaringRepositoryMethodsRepository.java
@@ -34,6 +34,7 @@ public interface RedeclaringRepositoryMethodsRepository extends CrudRepository<U
 	/**
 	 * Should not find any users at all.
 	 */
+	@Override
 	@Query("SELECT u FROM User u where u.id = -1")
 	List<User> findAll();
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/RepositoryMethodsWithEntityGraphConfigRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/RepositoryMethodsWithEntityGraphConfigRepository.java
index 39331802335..aded0c9af1c 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/RepositoryMethodsWithEntityGraphConfigRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/RepositoryMethodsWithEntityGraphConfigRepository.java
@@ -46,12 +46,14 @@ public interface RepositoryMethodsWithEntityGraphConfigRepository
 	/**
 	 * Should find all users.
 	 */
+	@Override
 	@EntityGraph(type = EntityGraphType.LOAD, value = "User.overview")
 	List<User> findAll();
 
 	/**
 	 * Should fetch all user details
 	 */
+	@Override
 	@EntityGraph(type = EntityGraphType.FETCH, value = "User.detail")
 	Optional<User> findById(Integer id);
 
@@ -64,6 +66,7 @@ public interface RepositoryMethodsWithEntityGraphConfigRepository
 	User getOneWithAttributeNamesById(Integer id);
 
 	// DATAJPA-790
+	@Override
 	@EntityGraph("User.detail")
 	Page<User> findAll(Predicate predicate, Pageable pageable);
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java
index c3e788bf73a..275f9194ea1 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java
@@ -40,6 +40,7 @@ public interface RoleRepository extends CrudRepository<Role, Integer>, QuerydslP
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findAll()
 	 */
+	@Override
 	@Lock(LockModeType.READ)
 	@QueryHints(@QueryHint(name = "foo", value = "bar"))
 	Iterable<Role> findAll();
@@ -48,6 +49,7 @@ public interface RoleRepository extends CrudRepository<Role, Integer>, QuerydslP
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable)
 	 */
+	@Override
 	@Lock(LockModeType.READ)
 	@QueryHints(@QueryHint(name = "foo", value = "bar"))
 	Optional<Role> findById(Integer id);
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/SampleEvaluationContextExtension.java b/src/test/java/org/springframework/data/jpa/repository/sample/SampleEvaluationContextExtension.java
index b9dbf51fb84..f3d1b2f1e9a 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/SampleEvaluationContextExtension.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/SampleEvaluationContextExtension.java
@@ -44,6 +44,7 @@ public static class SampleSecurityContextHolder {
 
 		private static ThreadLocal<SampleAuthentication> auth = new ThreadLocal<SampleAuthentication>() {
 
+			@Override
 			protected SampleAuthentication initialValue() {
 				return new SampleAuthentication(new SampleUser(-1, "anonymous"));
 			}
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
index c6190b2dbd6..c9f715f986b 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
@@ -68,6 +68,7 @@ public interface UserRepository
 	 * Redeclaration of {@link CrudRepository#findById(java.io.Serializable)} to change transaction configuration.
 	 */
 	@Transactional
+	@Override
 	java.util.Optional<User> findById(Integer primaryKey);
 
 	/**
@@ -75,6 +76,7 @@ public interface UserRepository
 	 * configuration of the original method is considered if the redeclaration does not carry a {@link Transactional}
 	 * annotation.
 	 */
+	@Override
 	void deleteById(Integer id); // DATACMNS-649
 
 	/**
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java
index 5f6ec90e5f8..1237bd0129f 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepositoryImpl.java
@@ -40,6 +40,7 @@ public UserRepositoryImpl(JpaContext context) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.sample.UserRepositoryCustom#someCustomMethod(org.springframework.data.jpa.domain.sample.User)
 	 */
+	@Override
 	public void someCustomMethod(User u) {
 		LOG.debug("Some custom method was invoked!");
 	}
@@ -48,6 +49,7 @@ public void someCustomMethod(User u) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jpa.repository.sample.UserRepositoryCustom#findByOverrridingMethod()
 	 */
+	@Override
 	public void findByOverrridingMethod() {
 		LOG.debug("A method overriding a finder was invoked!");
 	}
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java
index 4e5dc0f2d74..ad50806ed07 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java
@@ -66,6 +66,7 @@ public void considersEntityWithUnsetCompundIdNew() {}
 	 * Re-activate test for DATAJPA-820.
 	 */
 	@Test
+	@Override
 	public void detectsVersionPropertyOnMappedSuperClass() {
 		super.detectsVersionPropertyOnMappedSuperClass();
 	}
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java
index 4699930b05e..c59099b4b59 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java
@@ -74,26 +74,32 @@ public DummyJpaEntityInformation(Class<T> domainClass) {
 			super(domainClass);
 		}
 
+		@Override
 		public SingularAttribute<? super T, ?> getIdAttribute() {
 			return null;
 		}
 
+		@Override
 		public ID getId(T entity) {
 			return null;
 		}
 
+		@Override
 		public Class<ID> getIdType() {
 			return null;
 		}
 
+		@Override
 		public Iterable<String> getIdAttributeNames() {
 			return Collections.emptySet();
 		}
 
+		@Override
 		public boolean hasCompositeId() {
 			return false;
 		}
 
+		@Override
 		public Object getCompositeIdAttributeValue(Object id, String idAttribute) {
 			return null;
 		}
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java
index f375af8fb85..5f4ca8578e0 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java
@@ -74,11 +74,13 @@ class Foo implements Persistable<Long> {
 
 		Long id;
 
+		@Override
 		public Long getId() {
 
 			return id;
 		}
 
+		@Override
 		public boolean isNew() {
 
 			return id != null;
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java
index df688139a05..3b68b5954c9 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java
@@ -167,6 +167,7 @@ public void crudMethodMetadataPostProcessorUsesBeanClassLoader() {
 	private interface SimpleSampleRepository extends JpaRepository<User, Integer> {
 
 		@Transactional
+		@Override
 		Optional<User> findById(Integer id);
 	}
 
@@ -189,11 +190,13 @@ public interface SampleCustomRepository {
 	 */
 	private class SampleCustomRepositoryImpl implements SampleCustomRepository {
 
+		@Override
 		public void throwingRuntimeException() {
 
 			throw new IllegalArgumentException("You lose!");
 		}
 
+		@Override
 		public void throwingCheckedException() throws IOException {
 
 			throw new IOException("You lose!");
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java
index a7289eee4a9..70d3f74fd02 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java
@@ -46,6 +46,7 @@ public void findsIdClassOnMappedSuperclass() {}
 	 * Re-activate test for DATAJPA-820.
 	 */
 	@Test
+	@Override
 	public void detectsVersionPropertyOnMappedSuperClass() {
 		super.detectsVersionPropertyOnMappedSuperClass();
 	}
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java
index b3f11cc87dc..7ade0246399 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java
@@ -137,14 +137,17 @@ public void setEntityManager(EntityManager entityManager) {
 			super.setEntityManager(entityManager);
 		}
 
+		@Override
 		public List<User> findUsersByLastname(String lastname) {
 			return from(user).where(user.lastname.eq(lastname)).fetch();
 		}
 
+		@Override
 		public long updateLastnamesTo(String lastname) {
 			return update(user).set(user.lastname, lastname).execute();
 		}
 
+		@Override
 		public long deleteAllWithLastname(String lastname) {
 			return delete(user).where(user.lastname.eq(lastname)).execute();
 		}
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java
index 71a78eedabd..d372224f7a4 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java
@@ -102,11 +102,13 @@ public DelegatingTransactionManager(PlatformTransactionManager txManager) {
 			this.txManager = txManager;
 		}
 
+		@Override
 		public void commit(TransactionStatus status) throws TransactionException {
 
 			txManager.commit(status);
 		}
 
+		@Override
 		public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
 
 			this.transactionRequests++;
@@ -131,6 +133,7 @@ public void resetCount() {
 			this.definition = null;
 		}
 
+		@Override
 		public void rollback(TransactionStatus status) throws TransactionException {
 
 			txManager.rollback(status);
diff --git a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java
index 5b2b1189fa8..aaf19283a40 100644
--- a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java
@@ -120,6 +120,7 @@ public void shouldFindJpaMappingFilesFromNestedJarLocationsOnClasspath() {
 
 		ResourceLoader resolver = new PathMatchingResourcePatternResolver(new DefaultResourceLoader()) {
 
+			@Override
 			public Resource[] getResources(String locationPattern) throws IOException {
 
 				Resource[] resources = super.getResources(locationPattern);