diff --git a/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java b/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java index dc73b4222..8ac0e5ede 100644 --- a/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java +++ b/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java @@ -63,10 +63,6 @@ public class DtoInstantiatingConverter implements Converter { this.instantiator = instantiators.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType)); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @NonNull @Override public Object convert(Object source) { diff --git a/src/main/java/org/springframework/data/mapping/Parameter.java b/src/main/java/org/springframework/data/mapping/Parameter.java index fa682994b..e7e4e26d6 100644 --- a/src/main/java/org/springframework/data/mapping/Parameter.java +++ b/src/main/java/org/springframework/data/mapping/Parameter.java @@ -143,10 +143,6 @@ public class Parameter> { return this.hasSpelExpression.get(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -173,10 +169,6 @@ public class Parameter> { return ObjectUtils.nullSafeEquals(entity, parameter.entity); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { int result = ObjectUtils.nullSafeHashCode(name); diff --git a/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java b/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java index 68cfe8dbe..fcf7edcd8 100644 --- a/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java +++ b/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java @@ -272,11 +272,6 @@ class EntityCallbackDiscoverer { && callbackType.isAssignableFrom(ResolvableType.forInstance(callback)); } - /** - * (non-Javadoc) - * - * @see org.springframework.beans.factory.BeanClassLoaderAware - */ public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; } diff --git a/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java b/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java index 252436b9f..ae4381451 100644 --- a/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java +++ b/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java @@ -106,10 +106,6 @@ public class InstantiationAwarePropertyAccessor implements PersistentProperty this.bean = (T) instantiator.createInstance(owner, new ParameterValueProvider() { - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.ParameterValueProvider#getParameterValue(org.springframework.data.mapping.PreferredConstructor.Parameter) - */ @Override @Nullable @SuppressWarnings("null") diff --git a/src/main/java/org/springframework/data/util/CustomCollections.java b/src/main/java/org/springframework/data/util/CustomCollections.java index d4c799673..85cf0a3a6 100644 --- a/src/main/java/org/springframework/data/util/CustomCollections.java +++ b/src/main/java/org/springframework/data/util/CustomCollections.java @@ -295,46 +295,26 @@ public class CustomCollections { private static final TypeDescriptor OBJECT_DESCRIPTOR = TypeDescriptor.valueOf(Object.class); - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#isAvailable() - */ @Override public boolean isAvailable() { return ClassUtils.isPresent("io.vavr.control.Option", VavrCollections.class.getClassLoader()); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#getMapTypes() - */ @Override public Collection> getMapTypes() { return Set.of(io.vavr.collection.Map.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#getCollectionTypes() - */ @Override public Collection> getCollectionTypes() { return List.of(Seq.class, io.vavr.collection.Set.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#getAllowedPaginationReturnTypes() - */ @Override public Collection> getAllowedPaginationReturnTypes() { return Set.of(Seq.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#registerConvertersIn(org.springframework.core.convert.converter.ConverterRegistry) - */ @Override public void registerConvertersIn(ConverterRegistry registry) { @@ -342,10 +322,6 @@ public class CustomCollections { registry.addConverter(VavrToJavaCollectionConverter.INSTANCE); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#toJavaNativeCollection() - */ @Override @SuppressWarnings("null") public Function toJavaNativeCollection() { @@ -361,10 +337,6 @@ public class CustomCollections { private static final TypeDescriptor TRAVERSAL_TYPE = TypeDescriptor.valueOf(Traversable.class); - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @NonNull @Override public Set getConvertibleTypes() { @@ -374,10 +346,6 @@ public class CustomCollections { .collect(Collectors.toSet()); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.ConditionalConverter#matches(org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -385,10 +353,6 @@ public class CustomCollections { && COLLECTIONS_AND_MAP.contains(targetType.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Nullable @Override public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -428,20 +392,12 @@ public class CustomCollections { CONVERTIBLE_PAIRS = Collections.unmodifiableSet(pairs); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @NonNull @Override public java.util.Set getConvertibleTypes() { return CONVERTIBLE_PAIRS; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.ConditionalConverter#matches(org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -459,10 +415,6 @@ public class CustomCollections { return true; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Nullable @Override public Object convert(@Nullable Object source, TypeDescriptor sourceDescriptor, TypeDescriptor targetDescriptor) { @@ -503,48 +455,28 @@ public class CustomCollections { static class EclipseCollections implements CustomCollectionRegistrar { - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#isAvailable() - */ @Override public boolean isAvailable() { return ClassUtils.isPresent("org.eclipse.collections.api.list.ImmutableList", EclipseCollections.class.getClassLoader()); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#getCollectionTypes() - */ @Override public Collection> getCollectionTypes() { return List.of(ImmutableList.class, ImmutableSet.class, ImmutableBag.class, MutableList.class, MutableSet.class, MutableBag.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#getMapTypes() - */ @Override public Collection> getMapTypes() { return List.of(ImmutableMap.class, MutableMap.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#getAllowedPaginationReturnTypes() - */ @Override public Collection> getAllowedPaginationReturnTypes() { return List.of(ImmutableList.class, MutableList.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#toJavaNativeCollection() - */ @Override public Function toJavaNativeCollection() { @@ -553,10 +485,6 @@ public class CustomCollections { : source; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.CustomCollectionRegistrar#registerConvertersIn(org.springframework.core.convert.converter.ConverterRegistry) - */ @Override public void registerConvertersIn(ConverterRegistry registry) { @@ -570,10 +498,6 @@ public class CustomCollections { private static final TypeDescriptor RICH_ITERABLE_DESCRIPTOR = TypeDescriptor.valueOf(RichIterable.class); - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.ConditionalConverter#matches(org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -581,10 +505,6 @@ public class CustomCollections { && COLLECTIONS_AND_MAP.contains(targetType.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public Object convert(@Nullable Object source) { @@ -635,20 +555,12 @@ public class CustomCollections { CONVERTIBLE_PAIRS = Collections.unmodifiableSet(pairs); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @NonNull @Override public Set getConvertibleTypes() { return CONVERTIBLE_PAIRS; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.ConditionalConverter#matches(org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -667,10 +579,6 @@ public class CustomCollections { return true; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Nullable @Override public Object convert(@Nullable Object source, TypeDescriptor sourceDescriptor, TypeDescriptor targetDescriptor) { diff --git a/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java index c8b762be9..e189ba1c0 100644 --- a/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java @@ -41,10 +41,6 @@ public class ReactiveSortHandlerMethodArgumentResolver extends SortHandlerMethod return Sort.class.equals(parameter.getParameterType()); } - /* - *(non-Javadoc) - * @see org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentResolver#resolveArgumentValue(org.springframework.core.MethodParameter, org.springframework.web.reactive.BindingContext, org.springframework.web.server.ServerWebExchange) - */ @NonNull @Override public Sort resolveArgumentValue(MethodParameter parameter, BindingContext bindingContext, diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java index b7bb21258..0816481d5 100755 --- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java @@ -438,10 +438,6 @@ class AbstractMappingContextUnitTests { return new BasicPersistentEntity((TypeInformation) typeInformation) { - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify() - */ @Override public void verify() { if (rejectedTypes.stream().anyMatch(it -> it.isAssignableFrom(getType()))) {