DATAJPA-1335 - Add missing @OverRide annotations.

Original pull request: #272.
spring-projects · Nov 1, 2018 · 01e36db · 01e36db
1 parent c2cd7a3
commit 01e36db
Show file tree

Hide file tree

Showing 38 changed files with 104 additions and 1 deletion.
diff --git a/...n/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConverters.java b/...n/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
@@ -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
@@ -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
@@ -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/...ain/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.java b/...ain/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/...ain/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java b/...ain/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/...in/java/org/springframework/data/jpa/repository/config/JpaRepositoryNameSpaceHandler.java b/...in/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
@@ -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/...java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java b/...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/...ain/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java b/...ain/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/...n/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java b/...n/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
@@ -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
@@ -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());