From 01e36dbb44d6bc87f7deb3b6d6dacc955ea6c8bd Mon Sep 17 00:00:00 2001 From: Chr1st0ph Date: Fri, 27 Apr 2018 12:12:43 +0200 Subject: [PATCH] DATAJPA-1335 - Add missing @Override annotations. Original pull request: #272. --- .../ThreeTenBackPortJpaConverters.java | 1 + .../data/jpa/domain/AbstractPersistable.java | 2 ++ .../jpa/provider/PersistenceProvider.java | 3 +++ .../data/jpa/repository/JpaRepository.java | 4 ++++ .../config/AuditingBeanDefinitionParser.java | 2 ++ .../config/JpaRepositoryConfigExtension.java | 1 + .../config/JpaRepositoryNameSpaceHandler.java | 1 + .../query/QueryParameterSetter.java | 1 + .../CrudMethodMetadataPostProcessor.java | 1 + .../support/JpaEntityInformationSupport.java | 1 + .../JpaMetamodelEntityInformation.java | 7 ++++++ .../support/JpaRepositoryFactoryBean.java | 2 +- .../support/SimpleJpaRepository.java | 24 +++++++++++++++++++ ...hScanningPersistenceUnitPostProcessor.java | 2 ++ .../domain/sample/PersistableWithIdClass.java | 2 ++ .../jpa/domain/sample/UserSpecifications.java | 3 +++ ...raphRepositoryMethodsIntegrationTests.java | 8 +++++++ .../ParentRepositoryIntegrationTests.java | 2 ++ .../custom/CustomGenericJpaRepository.java | 1 + .../custom/UserCustomExtendedRepository.java | 2 ++ .../query/JpaQueryExecutionUnitTests.java | 1 + .../EmployeeRepositoryWithEmbeddedId.java | 1 + .../sample/EmployeeRepositoryWithIdClass.java | 1 + .../sample/MailMessageRepository.java | 1 + ...edeclaringRepositoryMethodsRepository.java | 1 + ...ethodsWithEntityGraphConfigRepository.java | 3 +++ .../jpa/repository/sample/RoleRepository.java | 2 ++ .../SampleEvaluationContextExtension.java | 1 + .../jpa/repository/sample/UserRepository.java | 2 ++ .../repository/sample/UserRepositoryImpl.java | 2 ++ ...odelEntityInformationIntegrationTests.java | 1 + .../JpaEntityInformationSupportUnitTests.java | 6 +++++ ...PersistableEntityInformationUnitTests.java | 2 ++ .../JpaRepositoryFactoryUnitTests.java | 3 +++ ...odelEntityInformationIntegrationTests.java | 1 + .../QuerydslRepositorySupportTests.java | 3 +++ .../support/TransactionalRepositoryTests.java | 3 +++ ...PersistenceUnitPostProcessorUnitTests.java | 1 + 38 files changed, 104 insertions(+), 1 deletion(-) 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 255ff72c9..6ad0c638a 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 class ThreeTenBackPortJpaConverters { @Converter(autoApply = true) public static class ZoneIdConverter implements AttributeConverter { + @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 648aa12cf..2f83f1ca2 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 implements Pe * @see org.springframework.data.domain.Persistable#getId() */ @Nullable + @Override public PK getId() { return id; } @@ -66,6 +67,7 @@ public abstract class AbstractPersistable implements Pe * @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 3b889e63d..9c9887f2e 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 enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor { 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 enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor { * (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 d3332d72e..d2def8ff8 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 extends PagingAndSortingRepository, * (non-Javadoc) * @see org.springframework.data.repository.CrudRepository#findAll() */ + @Override List findAll(); /* * (non-Javadoc) * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort) */ + @Override List findAll(Sort sort); /* * (non-Javadoc) * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable) */ + @Override List findAllById(Iterable ids); /* * (non-Javadoc) * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable) */ + @Override List saveAll(Iterable 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 bfc6c29af..6262d9c2e 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 @@ public class AuditingBeanDefinitionParser implements BeanDefinitionParser { 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 4593bbc6d..01f84f60c 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 class JpaRepositoryConfigExtension extends RepositoryConfigurationExtensi * (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 8781125c1..07065ce3a 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 9691b531c..7e5c480b6 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 @@ interface 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 72fdafb7a..5c9ab07a0 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 @@ class CrudMethodMetadataPostProcessor implements RepositoryProxyPostProcessor, B * (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 bd01e7857..6809e752e 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 abstract class JpaEntityInformationSupport extends AbstractEntityI * (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 7723e64a8..9f6a347e4 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 class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (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 class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (non-Javadoc) * @see org.springframework.data.repository.core.EntityInformation#getIdType() */ + @Override @SuppressWarnings("unchecked") public Class getIdType() { return (Class) idMetadata.getType(); @@ -183,6 +185,7 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (non-Javadoc) * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getIdAttribute() */ + @Override public SingularAttribute getIdAttribute() { return idMetadata.getSimpleIdAttribute(); } @@ -191,6 +194,7 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (non-Javadoc) * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#hasCompositeId() */ + @Override public boolean hasCompositeId() { return !idMetadata.hasSimpleId(); } @@ -199,6 +203,7 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (non-Javadoc) * @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getIdAttributeNames() */ + @Override public Iterable getIdAttributeNames() { List attributeNames = new ArrayList(idMetadata.attributes.size()); @@ -214,6 +219,7 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (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 @@ public class JpaMetamodelEntityInformation extends JpaEntityInformationSu * (non-Javadoc) * @see java.lang.Iterable#iterator() */ + @Override public Iterator> 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 7b23eab76..babdcf03d 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 class JpaRepositoryFactoryBean, S, ID> /** * 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 d92183c92..13b6e8df7 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 class SimpleJpaRepository implements JpaRepositoryImplementation implements JpaRepositoryImplementation implements JpaRepositoryImplementation implements JpaRepositoryImplementation entities) { Assert.notNull(entities, "The given Iterable of entities not be null!"); @@ -180,6 +184,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation entities) { Assert.notNull(entities, "The given Iterable of entities not be null!"); @@ -197,6 +202,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation implements JpaRepositoryImplementation implements JpaRepositoryImplementation findById(ID id) { Assert.notNull(id, ID_MUST_NOT_BE_NULL); @@ -259,6 +267,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation implements JpaRepositoryImplementation findAll() { return getQuery(null, Sort.unsorted()).getResultList(); } @@ -310,6 +320,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findAllById(Iterable ids) { Assert.notNull(ids, "The given Iterable of Id's must not be null!"); @@ -339,6 +350,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findAll(Sort sort) { return getQuery(null, sort).getResultList(); } @@ -347,6 +359,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findAll(Pageable pageable) { if (isUnpaged(pageable)) { @@ -360,6 +373,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findOne(@Nullable Specification spec) { try { @@ -373,6 +387,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findAll(@Nullable Specification spec) { return getQuery(spec, Sort.unsorted()).getResultList(); } @@ -381,6 +396,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findAll(@Nullable Specification spec, Pageable pageable) { TypedQuery query = getQuery(spec, pageable); @@ -392,6 +408,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation findAll(@Nullable Specification spec, Sort sort) { return getQuery(spec, sort).getResultList(); } @@ -466,6 +483,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation implements JpaRepositoryImplementation spec) { return executeCountQuery(getCountQuery(spec, getDomainClass())); } @@ -483,6 +502,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation S save(S entity) { if (entityInformation.isNew(entity)) { @@ -498,6 +518,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation S saveAndFlush(S entity) { S result = save(entity); @@ -511,6 +532,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation List saveAll(Iterable entities) { Assert.notNull(entities, "The given Iterable of entities not be null!"); @@ -529,6 +551,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation implements JpaRepositoryImplementation 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 ff30be2f3..b4470e2e3 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 class ClasspathScanningPersistenceUnitPostProcessor * (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 class ClasspathScanningPersistenceUnitPostProcessor * (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 cc09963f9..d37c3a144 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 class PersistableWithIdClass implements Persistable() { + @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) { return cb.like(root.get("firstname").as(String.class), String.format("%%%s%%", expression)); @@ -79,6 +80,7 @@ public class UserSpecifications { return new Specification() { + @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) { query.orderBy(cb.asc(root.get("firstname"))); @@ -92,6 +94,7 @@ public class UserSpecifications { return new Specification() { + @Override public Predicate toPredicate(Root 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 3fd400b1f..ddc9cd060 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 311845689..4c258794f 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 class ParentRepositoryIntegrationTests { public void testWithoutJoin() throws Exception { Page page = repository.findAll(new Specification() { + @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) { Path> childrenPath = root.get("children"); query.distinct(true); @@ -82,6 +83,7 @@ public class ParentRepositoryIntegrationTests { @Test // DATAJPA-287 public void testWithJoin() throws Exception { Page page = repository.findAll(new Specification() { + @Override public Predicate toPredicate(Root 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 effdb72ad..c3c352621 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 class CustomGenericJpaRepository extends Simp * 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 cdc25ec10..16c08fd11 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 findAll(); + @Override @Transactional(readOnly = false, timeout = 10) Optional 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 c31fb48df..1acdf5e67 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 class JpaQueryExecutionUnitTests { 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 4c4a2633b..30be3b6d4 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, QuerydslPredicateExecutor { + @Override List 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 c9b7cad17..ca7d0edfa 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 @@ import com.querydsl.core.types.Predicate; public interface EmployeeRepositoryWithIdClass extends JpaRepository, QuerydslPredicateExecutor { + @Override List 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 b495e4d7a..5581c830a 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 @@ import com.querydsl.core.types.Predicate; public interface MailMessageRepository extends JpaRepository, QuerydslPredicateExecutor { + @Override List 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 11b0da372..b7a54c96a 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 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 393318023..aded0c9af 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 findAll(); /** * Should fetch all user details */ + @Override @EntityGraph(type = EntityGraphType.FETCH, value = "User.detail") Optional findById(Integer id); @@ -64,6 +66,7 @@ public interface RepositoryMethodsWithEntityGraphConfigRepository User getOneWithAttributeNamesById(Integer id); // DATAJPA-790 + @Override @EntityGraph("User.detail") Page 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 c3e788bf7..275f9194e 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, QuerydslP * (non-Javadoc) * @see org.springframework.data.repository.CrudRepository#findAll() */ + @Override @Lock(LockModeType.READ) @QueryHints(@QueryHint(name = "foo", value = "bar")) Iterable findAll(); @@ -48,6 +49,7 @@ public interface RoleRepository extends CrudRepository, QuerydslP * (non-Javadoc) * @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable) */ + @Override @Lock(LockModeType.READ) @QueryHints(@QueryHint(name = "foo", value = "bar")) Optional 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 b9dbf51fb..f3d1b2f1e 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 class SampleEvaluationContextExtension implements EvaluationContextExtens private static ThreadLocal auth = new ThreadLocal() { + @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 c6190b2db..c9f715f98 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 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 5f6ec90e5..1237bd012 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 class UserRepositoryImpl implements UserRepositoryCustom { * (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 class UserRepositoryImpl implements UserRepositoryCustom { * (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 4e5dc0f2d..ad50806ed 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 class EclipseLinkJpaMetamodelEntityInformationIntegrationTests * 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 4699930b0..c59099b4b 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 class JpaEntityInformationSupportUnitTests { super(domainClass); } + @Override public SingularAttribute getIdAttribute() { return null; } + @Override public ID getId(T entity) { return null; } + @Override public Class getIdType() { return null; } + @Override public Iterable 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 f375af8fb..5f4ca8578 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 @@ public class JpaPersistableEntityInformationUnitTests { 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 df688139a..3b68b5954 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 class JpaRepositoryFactoryUnitTests { private interface SimpleSampleRepository extends JpaRepository { @Transactional + @Override Optional findById(Integer id); } @@ -189,11 +190,13 @@ public class JpaRepositoryFactoryUnitTests { */ 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 a7289eee4..70d3f74fd 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 class OpenJpaMetamodelEntityInformationIntegrationTests extends JpaMetamo * 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 b3f11cc87..7ade02463 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 class QuerydslRepositorySupportTests { super.setEntityManager(entityManager); } + @Override public List 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 71a78eeda..d372224f7 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 class TransactionalRepositoryTests extends AbstractJUnit4SpringContextTes 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 class TransactionalRepositoryTests extends AbstractJUnit4SpringContextTes 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 5b2b1189f..aaf19283a 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 class ClasspathScanningPersistenceUnitPostProcessorUnitTests { ResourceLoader resolver = new PathMatchingResourcePatternResolver(new DefaultResourceLoader()) { + @Override public Resource[] getResources(String locationPattern) throws IOException { Resource[] resources = super.getResources(locationPattern);