Skip to content

Commit 01e36db

Browse files
Chr1st0phschauder
Chr1st0ph
authored and
schauder
committed
DATAJPA-1335 - Add missing @OverRide annotations.
Original pull request: #272.
1 parent c2cd7a3 commit 01e36db

File tree

38 files changed

+104
-1
lines changed

38 files changed

+104
-1
lines changed

‎src/main/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConverters.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public Instant convertToEntityAttribute(Date date) {
108108
@Converter(autoApply = true)
109109
public static class ZoneIdConverter implements AttributeConverter<ZoneId, String> {
110110

111+
@Override
111112
public String convertToDatabaseColumn(ZoneId zoneId) {
112113
return ZoneIdToStringConverter.INSTANCE.convert(zoneId);
113114
}

‎src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public abstract class AbstractPersistable<PK extends Serializable> implements Pe
4747
* @see org.springframework.data.domain.Persistable#getId()
4848
*/
4949
@Nullable
50+
@Override
5051
public PK getId() {
5152
return id;
5253
}
@@ -66,6 +67,7 @@ protected void setId(@Nullable PK id) {
6667
* @see org.springframework.data.domain.Persistable#isNew()
6768
*/
6869
@Transient // DATAJPA-622
70+
@Override
6971
public boolean isNew() {
7072
return null == getId();
7173
}

‎src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
5959
Collections.singletonList(HIBERNATE_ENTITY_MANAGER_INTERFACE), //
6060
Collections.singletonList(HIBERNATE_JPA_METAMODEL_TYPE)) {
6161

62+
@Override
6263
public String extractQueryString(Query query) {
6364
return HibernateUtils.getHibernateQuery(query);
6465
}
@@ -119,6 +120,7 @@ public CloseableIterator<Object> executeQueryWithResultStream(Query jpaQuery) {
119120
ECLIPSELINK(Collections.singleton(ECLIPSELINK_ENTITY_MANAGER_INTERFACE),
120121
Collections.singleton(ECLIPSELINK_JPA_METAMODEL_TYPE)) {
121122

123+
@Override
122124
public String extractQueryString(Query query) {
123125
return ((JpaQuery<?>) query).getDatabaseQuery().getJPQLString();
124126
}
@@ -307,6 +309,7 @@ public String getCountQueryPlaceholder() {
307309
* (non-Javadoc)
308310
* @see org.springframework.data.jpa.repository.query.QueryExtractor#canExtractQuery()
309311
*/
312+
@Override
310313
public boolean canExtractQuery() {
311314
return true;
312315
}

‎src/main/java/org/springframework/data/jpa/repository/JpaRepository.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,28 @@ public interface JpaRepository<T, ID> extends PagingAndSortingRepository<T, ID>,
3939
* (non-Javadoc)
4040
* @see org.springframework.data.repository.CrudRepository#findAll()
4141
*/
42+
@Override
4243
List<T> findAll();
4344

4445
/*
4546
* (non-Javadoc)
4647
* @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
4748
*/
49+
@Override
4850
List<T> findAll(Sort sort);
4951

5052
/*
5153
* (non-Javadoc)
5254
* @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
5355
*/
56+
@Override
5457
List<T> findAllById(Iterable<ID> ids);
5558

5659
/*
5760
* (non-Javadoc)
5861
* @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
5962
*/
63+
@Override
6064
<S extends T> List<S> saveAll(Iterable<S> entities);
6165

6266
/**

‎src/main/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class AuditingBeanDefinitionParser implements BeanDefinitionParser {
4848
* (non-Javadoc)
4949
* @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
5050
*/
51+
@Override
5152
public BeanDefinition parse(Element element, ParserContext parser) {
5253

5354
springConfiguredParser.parse(element, parser);
@@ -92,6 +93,7 @@ private static class SpringConfiguredBeanDefinitionParser implements BeanDefinit
9293

9394
private static final String BEAN_CONFIGURER_ASPECT_CLASS_NAME = "org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect";
9495

96+
@Override
9597
public BeanDefinition parse(Element element, ParserContext parserContext) {
9698

9799
if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {

‎src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConf
202202
* (non-Javadoc)
203203
* @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getConfigurationInspectionClassLoader(org.springframework.core.io.ResourceLoader)
204204
*/
205+
@Override
205206
protected ClassLoader getConfigurationInspectionClassLoader(ResourceLoader loader) {
206207

207208
ClassLoader classLoader = loader.getClassLoader();

‎src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryNameSpaceHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class JpaRepositoryNameSpaceHandler extends NamespaceHandlerSupport {
3131
*
3232
* @see org.springframework.beans.factory.xml.NamespaceHandler#init()
3333
*/
34+
@Override
3435
public void init() {
3536

3637
RepositoryConfigurationExtension extension = new JpaRepositoryConfigExtension();

‎src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class NamedOrIndexedQueryParameterSetter implements QueryParameterSetter {
7777
* @see org.springframework.data.jpa.repository.query.QueryParameterSetter#setParameter(javax.persistence.Query, java.lang.Object[])
7878
*/
7979
@SuppressWarnings("unchecked")
80+
@Override
8081
public void setParameter(Query query, Object[] values, ErrorHandling errorHandling) {
8182

8283
Object value = valueExtractor.apply(values);

‎src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ enum CrudMethodMetadataPopulatingMethodInterceptor implements MethodInterceptor
108108
* (non-Javadoc)
109109
* @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
110110
*/
111+
@Override
111112
public Object invoke(MethodInvocation invocation) throws Throwable {
112113

113114
Method method = invocation.getMethod();

‎src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public JpaEntityInformationSupport(Class<T> domainClass) {
7171
* (non-Javadoc)
7272
* @see org.springframework.data.jpa.repository.support.JpaEntityMetadata#getEntityName()
7373
*/
74+
@Override
7475
public String getEntityName() {
7576
return metadata.getEntityName();
7677
}

‎src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public String getEntityName() {
144144
* (non-Javadoc)
145145
* @see org.springframework.data.repository.core.EntityInformation#getId(java.lang.Object)
146146
*/
147+
@Override
147148
@Nullable
148149
@SuppressWarnings("unchecked")
149150
public ID getId(T entity) {
@@ -174,6 +175,7 @@ public ID getId(T entity) {
174175
* (non-Javadoc)
175176
* @see org.springframework.data.repository.core.EntityInformation#getIdType()
176177
*/
178+
@Override
177179
@SuppressWarnings("unchecked")
178180
public Class<ID> getIdType() {
179181
return (Class<ID>) idMetadata.getType();
@@ -183,6 +185,7 @@ public Class<ID> getIdType() {
183185
* (non-Javadoc)
184186
* @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getIdAttribute()
185187
*/
188+
@Override
186189
public SingularAttribute<? super T, ?> getIdAttribute() {
187190
return idMetadata.getSimpleIdAttribute();
188191
}
@@ -191,6 +194,7 @@ public Class<ID> getIdType() {
191194
* (non-Javadoc)
192195
* @see org.springframework.data.jpa.repository.support.JpaEntityInformation#hasCompositeId()
193196
*/
197+
@Override
194198
public boolean hasCompositeId() {
195199
return !idMetadata.hasSimpleId();
196200
}
@@ -199,6 +203,7 @@ public boolean hasCompositeId() {
199203
* (non-Javadoc)
200204
* @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getIdAttributeNames()
201205
*/
206+
@Override
202207
public Iterable<String> getIdAttributeNames() {
203208

204209
List<String> attributeNames = new ArrayList<String>(idMetadata.attributes.size());
@@ -214,6 +219,7 @@ public Iterable<String> getIdAttributeNames() {
214219
* (non-Javadoc)
215220
* @see org.springframework.data.jpa.repository.support.JpaEntityInformation#getCompositeIdAttributeValue(java.lang.Object, java.lang.String)
216221
*/
222+
@Override
217223
public Object getCompositeIdAttributeValue(Object id, String idAttribute) {
218224

219225
Assert.isTrue(hasCompositeId(), "Model must have a composite Id!");
@@ -306,6 +312,7 @@ private static Class<?> fallbackIdTypeLookup(IdentifiableType<?> type) {
306312
* (non-Javadoc)
307313
* @see java.lang.Iterable#iterator()
308314
*/
315+
@Override
309316
public Iterator<SingularAttribute<? super T, ?>> iterator() {
310317
return attributes.iterator();
311318
}

‎src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void setMappingContext(MappingContext<?, ?> mappingContext) {
7676
/**
7777
* Configures the {@link EntityPathResolver} to be used. Will expect a canonical bean to be present but fallback to
7878
* {@link SimpleEntityPathResolver#INSTANCE} in case none is available.
79-
*
79+
*
8080
* @param resolver must not be {@literal null}.
8181
*/
8282
@Autowired

‎src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public SimpleJpaRepository(Class<T> domainClass, EntityManager em) {
114114
*
115115
* @param crudMethodMetadata
116116
*/
117+
@Override
117118
public void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
118119
this.metadata = crudMethodMetadata;
119120
}
@@ -142,6 +143,7 @@ private String getCountQueryString() {
142143
* @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable)
143144
*/
144145
@Transactional
146+
@Override
145147
public void deleteById(ID id) {
146148

147149
Assert.notNull(id, ID_MUST_NOT_BE_NULL);
@@ -155,6 +157,7 @@ public void deleteById(ID id) {
155157
* @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
156158
*/
157159
@Transactional
160+
@Override
158161
public void delete(T entity) {
159162

160163
Assert.notNull(entity, "The entity must not be null!");
@@ -166,6 +169,7 @@ public void delete(T entity) {
166169
* @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
167170
*/
168171
@Transactional
172+
@Override
169173
public void deleteAll(Iterable<? extends T> entities) {
170174

171175
Assert.notNull(entities, "The given Iterable of entities not be null!");
@@ -180,6 +184,7 @@ public void deleteAll(Iterable<? extends T> entities) {
180184
* @see org.springframework.data.jpa.repository.JpaRepository#deleteInBatch(java.lang.Iterable)
181185
*/
182186
@Transactional
187+
@Override
183188
public void deleteInBatch(Iterable<T> entities) {
184189

185190
Assert.notNull(entities, "The given Iterable of entities not be null!");
@@ -197,6 +202,7 @@ public void deleteInBatch(Iterable<T> entities) {
197202
* @see org.springframework.data.repository.Repository#deleteAll()
198203
*/
199204
@Transactional
205+
@Override
200206
public void deleteAll() {
201207

202208
for (T element : findAll()) {
@@ -209,6 +215,7 @@ public void deleteAll() {
209215
* @see org.springframework.data.jpa.repository.JpaRepository#deleteAllInBatch()
210216
*/
211217
@Transactional
218+
@Override
212219
public void deleteAllInBatch() {
213220
em.createQuery(getDeleteAllQueryString()).executeUpdate();
214221
}
@@ -217,6 +224,7 @@ public void deleteAllInBatch() {
217224
* (non-Javadoc)
218225
* @see org.springframework.data.repository.CrudRepository#findById(java.io.Serializable)
219226
*/
227+
@Override
220228
public Optional<T> findById(ID id) {
221229

222230
Assert.notNull(id, ID_MUST_NOT_BE_NULL);
@@ -259,6 +267,7 @@ public T getOne(ID id) {
259267
* (non-Javadoc)
260268
* @see org.springframework.data.repository.CrudRepository#existsById(java.io.Serializable)
261269
*/
270+
@Override
262271
public boolean existsById(ID id) {
263272

264273
Assert.notNull(id, ID_MUST_NOT_BE_NULL);
@@ -302,6 +311,7 @@ public boolean existsById(ID id) {
302311
* (non-Javadoc)
303312
* @see org.springframework.data.jpa.repository.JpaRepository#findAll()
304313
*/
314+
@Override
305315
public List<T> findAll() {
306316
return getQuery(null, Sort.unsorted()).getResultList();
307317
}
@@ -310,6 +320,7 @@ public List<T> findAll() {
310320
* (non-Javadoc)
311321
* @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
312322
*/
323+
@Override
313324
public List<T> findAllById(Iterable<ID> ids) {
314325

315326
Assert.notNull(ids, "The given Iterable of Id's must not be null!");
@@ -339,6 +350,7 @@ public List<T> findAllById(Iterable<ID> ids) {
339350
* (non-Javadoc)
340351
* @see org.springframework.data.jpa.repository.JpaRepository#findAll(org.springframework.data.domain.Sort)
341352
*/
353+
@Override
342354
public List<T> findAll(Sort sort) {
343355
return getQuery(null, sort).getResultList();
344356
}
@@ -347,6 +359,7 @@ public List<T> findAll(Sort sort) {
347359
* (non-Javadoc)
348360
* @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
349361
*/
362+
@Override
350363
public Page<T> findAll(Pageable pageable) {
351364

352365
if (isUnpaged(pageable)) {
@@ -360,6 +373,7 @@ public Page<T> findAll(Pageable pageable) {
360373
* (non-Javadoc)
361374
* @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findOne(org.springframework.data.jpa.domain.Specification)
362375
*/
376+
@Override
363377
public Optional<T> findOne(@Nullable Specification<T> spec) {
364378

365379
try {
@@ -373,6 +387,7 @@ public Optional<T> findOne(@Nullable Specification<T> spec) {
373387
* (non-Javadoc)
374388
* @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findAll(org.springframework.data.jpa.domain.Specification)
375389
*/
390+
@Override
376391
public List<T> findAll(@Nullable Specification<T> spec) {
377392
return getQuery(spec, Sort.unsorted()).getResultList();
378393
}
@@ -381,6 +396,7 @@ public List<T> findAll(@Nullable Specification<T> spec) {
381396
* (non-Javadoc)
382397
* @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findAll(org.springframework.data.jpa.domain.Specification, org.springframework.data.domain.Pageable)
383398
*/
399+
@Override
384400
public Page<T> findAll(@Nullable Specification<T> spec, Pageable pageable) {
385401

386402
TypedQuery<T> query = getQuery(spec, pageable);
@@ -392,6 +408,7 @@ public Page<T> findAll(@Nullable Specification<T> spec, Pageable pageable) {
392408
* (non-Javadoc)
393409
* @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#findAll(org.springframework.data.jpa.domain.Specification, org.springframework.data.domain.Sort)
394410
*/
411+
@Override
395412
public List<T> findAll(@Nullable Specification<T> spec, Sort sort) {
396413
return getQuery(spec, sort).getResultList();
397414
}
@@ -466,6 +483,7 @@ public <S extends T> Page<S> findAll(Example<S> example, Pageable pageable) {
466483
* (non-Javadoc)
467484
* @see org.springframework.data.repository.CrudRepository#count()
468485
*/
486+
@Override
469487
public long count() {
470488
return em.createQuery(getCountQueryString(), Long.class).getSingleResult();
471489
}
@@ -474,6 +492,7 @@ public long count() {
474492
* (non-Javadoc)
475493
* @see org.springframework.data.jpa.repository.JpaSpecificationExecutor#count(org.springframework.data.jpa.domain.Specification)
476494
*/
495+
@Override
477496
public long count(@Nullable Specification<T> spec) {
478497
return executeCountQuery(getCountQuery(spec, getDomainClass()));
479498
}
@@ -483,6 +502,7 @@ public long count(@Nullable Specification<T> spec) {
483502
* @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
484503
*/
485504
@Transactional
505+
@Override
486506
public <S extends T> S save(S entity) {
487507

488508
if (entityInformation.isNew(entity)) {
@@ -498,6 +518,7 @@ public <S extends T> S save(S entity) {
498518
* @see org.springframework.data.jpa.repository.JpaRepository#saveAndFlush(java.lang.Object)
499519
*/
500520
@Transactional
521+
@Override
501522
public <S extends T> S saveAndFlush(S entity) {
502523

503524
S result = save(entity);
@@ -511,6 +532,7 @@ public <S extends T> S saveAndFlush(S entity) {
511532
* @see org.springframework.data.jpa.repository.JpaRepository#save(java.lang.Iterable)
512533
*/
513534
@Transactional
535+
@Override
514536
public <S extends T> List<S> saveAll(Iterable<S> entities) {
515537

516538
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) {
529551
* @see org.springframework.data.jpa.repository.JpaRepository#flush()
530552
*/
531553
@Transactional
554+
@Override
532555
public void flush() {
533556
em.flush();
534557
}
@@ -770,6 +793,7 @@ private static final class ByIdsSpecification<T> implements Specification<T> {
770793
* (non-Javadoc)
771794
* @see org.springframework.data.jpa.domain.Specification#toPredicate(javax.persistence.criteria.Root, javax.persistence.criteria.CriteriaQuery, javax.persistence.criteria.CriteriaBuilder)
772795
*/
796+
@Override
773797
public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
774798

775799
Path<?> path = root.get(entityInformation.getIdAttribute());

0 commit comments

Comments
 (0)