diff --git a/src/main/java/org/springframework/data/auditing/AuditingHandler.java b/src/main/java/org/springframework/data/auditing/AuditingHandler.java index 220e24270..a2bcbbe0a 100644 --- a/src/main/java/org/springframework/data/auditing/AuditingHandler.java +++ b/src/main/java/org/springframework/data/auditing/AuditingHandler.java @@ -94,10 +94,6 @@ public class AuditingHandler extends AuditingHandlerSupport implements Initializ .orElse(Auditor.none()); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ public void afterPropertiesSet() { if (!auditorAware.isPresent()) { diff --git a/src/main/java/org/springframework/data/auditing/CurrentDateTimeProvider.java b/src/main/java/org/springframework/data/auditing/CurrentDateTimeProvider.java index 71becfe18..dce7be857 100644 --- a/src/main/java/org/springframework/data/auditing/CurrentDateTimeProvider.java +++ b/src/main/java/org/springframework/data/auditing/CurrentDateTimeProvider.java @@ -30,10 +30,6 @@ public enum CurrentDateTimeProvider implements DateTimeProvider { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.DateTimeProvider#getNow() - */ @Override public Optional getNow() { return Optional.of(LocalDateTime.now()); diff --git a/src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java b/src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java index 2d9033efa..30e66c202 100644 --- a/src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java +++ b/src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java @@ -106,10 +106,6 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory .getGeneric(2).resolve(TemporalAccessor.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setCreatedBy(java.util.Optional) - */ @Override public Object setCreatedBy(Object value) { @@ -117,10 +113,6 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setCreatedDate(java.util.Optional) - */ @Override public TemporalAccessor setCreatedDate(TemporalAccessor value) { @@ -129,10 +121,6 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.DefaultAuditableBeanWrapperFactory.AuditableInterfaceBeanWrapper#setLastModifiedBy(java.util.Optional) - */ @Override public Object setLastModifiedBy(Object value) { @@ -141,19 +129,11 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#getLastModifiedDate() - */ @Override public Optional getLastModifiedDate() { return getAsTemporalAccessor(auditable.getLastModifiedDate(), TemporalAccessor.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setLastModifiedDate(java.util.Optional) - */ @Override public TemporalAccessor setLastModifiedDate(TemporalAccessor value) { @@ -163,10 +143,6 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#getBean() - */ @Override public Auditable getBean() { return auditable; @@ -280,38 +256,22 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory this.target = target; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setCreatedBy(java.util.Optional) - */ @Override public Object setCreatedBy(Object value) { return setField(metadata.getCreatedByField(), value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setCreatedDate(java.util.Optional) - */ @Override public TemporalAccessor setCreatedDate(TemporalAccessor value) { return setDateField(metadata.getCreatedDateField(), value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setLastModifiedBy(java.util.Optional) - */ @Override public Object setLastModifiedBy(Object value) { return setField(metadata.getLastModifiedByField(), value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#getLastModifiedDate() - */ @Override public Optional getLastModifiedDate() { @@ -323,19 +283,11 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory }), TemporalAccessor.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setLastModifiedDate(java.util.Optional) - */ @Override public TemporalAccessor setLastModifiedDate(TemporalAccessor value) { return setDateField(metadata.getLastModifiedDateField(), value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#getBean() - */ @Override public T getBean() { return target; diff --git a/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java b/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java index 24d3fb827..3a724e32e 100644 --- a/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java +++ b/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java @@ -70,10 +70,6 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap this.metadataCache = new ConcurrentReferenceHashMap<>(); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapperFactory#getBeanWrapperFor(java.lang.Object) - */ @Override public Optional> getBeanWrapperFor(T source) { @@ -195,37 +191,21 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap this.metadata = metadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setCreatedBy(java.lang.Object) - */ @Override public Object setCreatedBy(Object value) { return setProperty(metadata.createdByPaths, value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setCreatedDate(java.util.Optional) - */ @Override public TemporalAccessor setCreatedDate(TemporalAccessor value) { return setDateProperty(metadata.createdDatePaths, value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setLastModifiedBy(java.util.Optional) - */ @Override public Object setLastModifiedBy(Object value) { return setProperty(metadata.lastModifiedByPaths, value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#getLastModifiedDate() - */ @Override public Optional getLastModifiedDate() { @@ -235,19 +215,11 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap return getAsTemporalAccessor(firstValue, TemporalAccessor.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#setLastModifiedDate(java.util.Optional) - */ @Override public TemporalAccessor setLastModifiedDate(TemporalAccessor value) { return setDateProperty(metadata.lastModifiedDatePaths, value); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.AuditableBeanWrapper#getBean() - */ @Override public T getBean() { return accessor.getBean(); diff --git a/src/main/java/org/springframework/data/auditing/config/AnnotationAuditingConfiguration.java b/src/main/java/org/springframework/data/auditing/config/AnnotationAuditingConfiguration.java index 6500bbcd8..ef4fc9414 100644 --- a/src/main/java/org/springframework/data/auditing/config/AnnotationAuditingConfiguration.java +++ b/src/main/java/org/springframework/data/auditing/config/AnnotationAuditingConfiguration.java @@ -55,37 +55,21 @@ public class AnnotationAuditingConfiguration implements AuditingConfiguration { this.attributes = new AnnotationAttributes(attributesSource); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingConfiguration#getAuditorAwareRef() - */ @Override public String getAuditorAwareRef() { return attributes.getString("auditorAwareRef"); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingConfiguration#isSetDates() - */ @Override public boolean isSetDates() { return attributes.getBoolean("setDates"); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingConfiguration#getDateTimeProviderRef() - */ @Override public String getDateTimeProviderRef() { return attributes.getString("dateTimeProviderRef"); } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingConfiguration#isModifyOnCreate() - */ @Override public boolean isModifyOnCreate() { return attributes.getBoolean("modifyOnCreate"); diff --git a/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java b/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java index 94435f9bf..1a946a4a6 100644 --- a/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java +++ b/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java @@ -50,10 +50,6 @@ public abstract class AuditingBeanDefinitionRegistrarSupport implements ImportBe private static final String MODIFY_ON_CREATE = "modifyOnCreation"; private static final String SET_DATES = "dateTimeForNow"; - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ImportBeanDefinitionRegistrar#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry) - */ @Override public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) { diff --git a/src/main/java/org/springframework/data/auditing/config/AuditingHandlerBeanDefinitionParser.java b/src/main/java/org/springframework/data/auditing/config/AuditingHandlerBeanDefinitionParser.java index 88f5e00ab..0deeb058b 100644 --- a/src/main/java/org/springframework/data/auditing/config/AuditingHandlerBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/auditing/config/AuditingHandlerBeanDefinitionParser.java @@ -69,29 +69,17 @@ public class AuditingHandlerBeanDefinitionParser extends AbstractSingleBeanDefin return resolvedBeanName; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @NonNull @Override protected Class getBeanClass(Element element) { return AuditingHandler.class; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateId() - */ @Override protected boolean shouldGenerateId() { return true; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, BeanDefinitionBuilder builder) { @@ -110,10 +98,6 @@ public class AuditingHandlerBeanDefinitionParser extends AbstractSingleBeanDefin ParsingUtils.setPropertyValue(builder, element, "modify-on-creation", "modifyOnCreation"); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) { diff --git a/src/main/java/org/springframework/data/auditing/config/IsNewAwareAuditingHandlerBeanDefinitionParser.java b/src/main/java/org/springframework/data/auditing/config/IsNewAwareAuditingHandlerBeanDefinitionParser.java index bc3564715..854237a49 100644 --- a/src/main/java/org/springframework/data/auditing/config/IsNewAwareAuditingHandlerBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/auditing/config/IsNewAwareAuditingHandlerBeanDefinitionParser.java @@ -37,10 +37,6 @@ public class IsNewAwareAuditingHandlerBeanDefinitionParser extends AuditingHandl super(mappingContextBeanName); } - /* - * (non-Javadoc) - * @see org.springframework.data.config.AuditingHandlerBeanDefinitionParser#getBeanClass(org.w3c.dom.Element) - */ @Override protected Class getBeanClass(Element element) { return IsNewAwareAuditingHandler.class; diff --git a/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java b/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java index 95d2baa54..2aa29881a 100644 --- a/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java +++ b/src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java @@ -66,18 +66,10 @@ public class ConfigurableTypeInformationMapper implements TypeInformationMapper } } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeInformationMapper#createAliasFor(org.springframework.data.util.TypeInformation) - */ public Alias createAliasFor(TypeInformation type) { return typeToAlias.getOrDefault(type, Alias.NONE); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeInformationMapper#resolveTypeFrom(org.springframework.data.mapping.Alias) - */ @Nullable @Override public TypeInformation resolveTypeFrom(Alias alias) { diff --git a/src/main/java/org/springframework/data/convert/CustomConversions.java b/src/main/java/org/springframework/data/convert/CustomConversions.java index e6420c47f..35daed439 100644 --- a/src/main/java/org/springframework/data/convert/CustomConversions.java +++ b/src/main/java/org/springframework/data/convert/CustomConversions.java @@ -827,10 +827,6 @@ public class CustomConversions { return this.storeConverters; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -849,10 +845,6 @@ public class CustomConversions { return ObjectUtils.nullSafeEquals(storeConverters, that.storeConverters); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(storeTypeHolder); @@ -860,10 +852,6 @@ public class CustomConversions { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "StoreConversions{" + "storeTypeHolder=" + storeTypeHolder + ", storeConverters=" + storeConverters + '}'; diff --git a/src/main/java/org/springframework/data/convert/DefaultConverterBuilder.java b/src/main/java/org/springframework/data/convert/DefaultConverterBuilder.java index d1f84472c..b7e5a0df5 100644 --- a/src/main/java/org/springframework/data/convert/DefaultConverterBuilder.java +++ b/src/main/java/org/springframework/data/convert/DefaultConverterBuilder.java @@ -48,48 +48,28 @@ record DefaultConverterBuilder (ConvertiblePair convertiblePair, Optional> writing, Optional> reading) implements ConverterAware, ReadingConverterBuilder, WritingConverterBuilder { - /* - * (non-Javadoc) - * @see org.springframework.data.convert.WritingConverterBuilder#andReading(java.util.function.Function) - */ @Override public ConverterAware andReading(Function function) { return withReading(Optional.of(function)); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.ReadingConverterBuilder#andWriting(java.util.function.Function) - */ @Override public ConverterAware andWriting(Function function) { return withWriting(Optional.of(function)); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.ReadingConverterBuilder#getRequiredReadingConverter() - */ @Override public GenericConverter getReadingConverter() { return getOptionalReadingConverter() .orElseThrow(() -> new IllegalStateException("No reading converter specified!")); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.WritingConverterBuilder#getRequiredWritingConverter() - */ @Override public GenericConverter getWritingConverter() { return getOptionalWritingConverter() .orElseThrow(() -> new IllegalStateException("No writing converter specified!")); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.ConverterBuilder#getConverters() - */ @Override public Set getConverters() { @@ -130,10 +110,6 @@ record DefaultConverterBuilder (ConvertiblePair convertiblePair, this.function = function; } - /* - * (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 @SuppressWarnings("unchecked") @@ -141,20 +117,11 @@ record DefaultConverterBuilder (ConvertiblePair convertiblePair, return function.apply((S) source); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ - @Override public Set getConvertibleTypes() { return Collections.singleton(convertiblePair); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -173,10 +140,6 @@ record DefaultConverterBuilder (ConvertiblePair convertiblePair, return ObjectUtils.nullSafeEquals(function, that.function); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(convertiblePair); diff --git a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java index 2ca7d24da..1340c458d 100644 --- a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java +++ b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java @@ -107,10 +107,6 @@ public class DefaultTypeMapper implements TypeMapper, BeanClassLoaderAware }; } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeMapper#readType(java.lang.Object) - */ @Nullable @Override public TypeInformation readType(S source) { @@ -139,10 +135,6 @@ public class DefaultTypeMapper implements TypeMapper, BeanClassLoaderAware return typeInformation.orElse(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeMapper#readType(java.lang.Object, org.springframework.data.util.TypeInformation) - */ @Override public TypeInformation readType(S source, TypeInformation basicType) { @@ -196,19 +188,11 @@ public class DefaultTypeMapper implements TypeMapper, BeanClassLoaderAware return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeMapper#writeType(java.lang.Class, java.lang.Object) - */ @Override public void writeType(Class type, S dbObject) { writeType(ClassTypeInformation.from(type), dbObject); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeMapper#writeType(org.springframework.data.util.TypeInformation, java.lang.Object) - */ @Override public void writeType(TypeInformation info, S sink) { @@ -220,10 +204,6 @@ public class DefaultTypeMapper implements TypeMapper, BeanClassLoaderAware } } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { for (TypeInformationMapper mapper : mappers) { diff --git a/src/main/java/org/springframework/data/convert/Jsr310Converters.java b/src/main/java/org/springframework/data/convert/Jsr310Converters.java index 8ae60f667..17121c9a4 100644 --- a/src/main/java/org/springframework/data/convert/Jsr310Converters.java +++ b/src/main/java/org/springframework/data/convert/Jsr310Converters.java @@ -283,10 +283,6 @@ public abstract class Jsr310Converters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @NonNull @Override public LocalDate convert(String source) { @@ -299,10 +295,6 @@ public abstract class Jsr310Converters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @NonNull @Override public LocalDateTime convert(String source) { @@ -315,10 +307,6 @@ public abstract class Jsr310Converters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @NonNull @Override public Instant convert(String source) { diff --git a/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java b/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java index d9ce62f0a..06ad27ef1 100644 --- a/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java +++ b/src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java @@ -57,10 +57,6 @@ public class MappingContextTypeInformationMapper implements TypeInformationMappe } } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeInformationMapper#createAliasFor(org.springframework.data.util.TypeInformation) - */ public Alias createAliasFor(TypeInformation type) { return typeMap.computeIfAbsent(type.getRawTypeInformation(), key -> { @@ -111,10 +107,6 @@ public class MappingContextTypeInformationMapper implements TypeInformationMappe return alias; } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeInformationMapper#resolveTypeFrom(java.util.Optional) - */ @Nullable @Override public TypeInformation resolveTypeFrom(Alias alias) { diff --git a/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java b/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java index 9480c65fe..85ede096f 100644 --- a/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java +++ b/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java @@ -74,10 +74,6 @@ public class SimpleTypeInformationMapper implements TypeInformationMapper, BeanC return Alias.of(type.getType().getName()); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; diff --git a/src/main/java/org/springframework/data/domain/AbstractPageRequest.java b/src/main/java/org/springframework/data/domain/AbstractPageRequest.java index ce4e10d23..e5a80955d 100644 --- a/src/main/java/org/springframework/data/domain/AbstractPageRequest.java +++ b/src/main/java/org/springframework/data/domain/AbstractPageRequest.java @@ -52,50 +52,26 @@ public abstract class AbstractPageRequest implements Pageable, Serializable { this.size = size; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getPageSize() - */ public int getPageSize() { return size; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getPageNumber() - */ public int getPageNumber() { return page; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getOffset() - */ public long getOffset() { return (long) page * (long) size; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#hasPrevious() - */ public boolean hasPrevious() { return page > 0; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#previousOrFirst() - */ public Pageable previousOrFirst() { return hasPrevious() ? previous() : first(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#next() - */ public abstract Pageable next(); /** @@ -105,16 +81,8 @@ public abstract class AbstractPageRequest implements Pageable, Serializable { */ public abstract Pageable previous(); - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#first() - */ public abstract Pageable first(); - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -127,10 +95,6 @@ public abstract class AbstractPageRequest implements Pageable, Serializable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/src/main/java/org/springframework/data/domain/Chunk.java b/src/main/java/org/springframework/data/domain/Chunk.java index ef4ebd6bd..d486e6e74 100644 --- a/src/main/java/org/springframework/data/domain/Chunk.java +++ b/src/main/java/org/springframework/data/domain/Chunk.java @@ -54,108 +54,56 @@ abstract class Chunk implements Slice, Serializable { this.pageable = pageable; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#getNumber() - */ public int getNumber() { return pageable.isPaged() ? pageable.getPageNumber() : 0; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#getSize() - */ public int getSize() { return pageable.isPaged() ? pageable.getPageSize() : content.size(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#getNumberOfElements() - */ public int getNumberOfElements() { return content.size(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#hasPrevious() - */ public boolean hasPrevious() { return getNumber() > 0; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#isFirst() - */ public boolean isFirst() { return !hasPrevious(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#isLast() - */ public boolean isLast() { return !hasNext(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#nextPageable() - */ public Pageable nextPageable() { return hasNext() ? pageable.next() : Pageable.unpaged(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#previousPageable() - */ public Pageable previousPageable() { return hasPrevious() ? pageable.previousOrFirst() : Pageable.unpaged(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#hasContent() - */ public boolean hasContent() { return !content.isEmpty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#getContent() - */ public List getContent() { return Collections.unmodifiableList(content); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#getPageable() - */ @Override public Pageable getPageable() { return pageable; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#getSort() - */ @Override public Sort getSort() { return pageable.getSort(); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return content.iterator(); } @@ -173,10 +121,6 @@ abstract class Chunk implements Slice, Serializable { return this.stream().map(converter::apply).collect(Collectors.toList()); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -194,10 +138,6 @@ abstract class Chunk implements Slice, Serializable { return contentEqual && pageableEqual; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/data/domain/ExampleMatcher.java b/src/main/java/org/springframework/data/domain/ExampleMatcher.java index c59823578..42dd37369 100644 --- a/src/main/java/org/springframework/data/domain/ExampleMatcher.java +++ b/src/main/java/org/springframework/data/domain/ExampleMatcher.java @@ -440,10 +440,6 @@ public interface ExampleMatcher { return other instanceof GenericPropertyMatcher; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -465,10 +461,6 @@ public interface ExampleMatcher { return ObjectUtils.nullSafeEquals(valueTransformer, that.valueTransformer); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(stringMatcher); @@ -607,10 +599,6 @@ public interface ExampleMatcher { INSTANCE; - /* - * (non-Javadoc) - * @see java.util.function.Function#apply(java.lang.Object) - */ @Override @SuppressWarnings("null") public Optional apply(Optional source) { @@ -738,10 +726,6 @@ public interface ExampleMatcher { return getPropertyValueTransformer().apply(source); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -767,10 +751,6 @@ public interface ExampleMatcher { return ObjectUtils.nullSafeEquals(valueTransformer, that.valueTransformer); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(path); @@ -825,10 +805,6 @@ public interface ExampleMatcher { return propertySpecifiers.values(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -843,10 +819,6 @@ public interface ExampleMatcher { return ObjectUtils.nullSafeEquals(propertySpecifiers, that.propertySpecifiers); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(propertySpecifiers); diff --git a/src/main/java/org/springframework/data/domain/PageImpl.java b/src/main/java/org/springframework/data/domain/PageImpl.java index d3bf388bb..e7ca84eec 100644 --- a/src/main/java/org/springframework/data/domain/PageImpl.java +++ b/src/main/java/org/springframework/data/domain/PageImpl.java @@ -61,55 +61,31 @@ public class PageImpl extends Chunk implements Page { this(content, Pageable.unpaged(), null == content ? 0 : content.size()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Page#getTotalPages() - */ @Override public int getTotalPages() { return getSize() == 0 ? 1 : (int) Math.ceil((double) total / (double) getSize()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Page#getTotalElements() - */ @Override public long getTotalElements() { return total; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#hasNext() - */ @Override public boolean hasNext() { return getNumber() + 1 < getTotalPages(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#isLast() - */ @Override public boolean isLast() { return !hasNext(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#transform(org.springframework.core.convert.converter.Converter) - */ @Override public Page map(Function converter) { return new PageImpl<>(getConvertedContent(converter), getPageable(), total); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -123,10 +99,6 @@ public class PageImpl extends Chunk implements Page { return String.format("Page %s of %d containing %s instances", getNumber() + 1, getTotalPages(), contentType); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -141,10 +113,6 @@ public class PageImpl extends Chunk implements Page { return this.total == that.total && super.equals(obj); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/data/domain/PageRequest.java b/src/main/java/org/springframework/data/domain/PageRequest.java index 0f27e3795..e9ee12400 100644 --- a/src/main/java/org/springframework/data/domain/PageRequest.java +++ b/src/main/java/org/springframework/data/domain/PageRequest.java @@ -96,45 +96,25 @@ public class PageRequest extends AbstractPageRequest { return PageRequest.of(0, pageSize); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getSort() - */ public Sort getSort() { return sort; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#next() - */ @Override public PageRequest next() { return new PageRequest(getPageNumber() + 1, getPageSize(), getSort()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.AbstractPageRequest#previous() - */ @Override public PageRequest previous() { return getPageNumber() == 0 ? this : new PageRequest(getPageNumber() - 1, getPageSize(), getSort()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#first() - */ @Override public PageRequest first() { return new PageRequest(0, getPageSize(), getSort()); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -184,19 +164,11 @@ public class PageRequest extends AbstractPageRequest { return new PageRequest(getPageNumber(), getPageSize(), sort); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return 31 * super.hashCode() + sort.hashCode(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Page request [number: %d, size %d, sort: %s]", getPageNumber(), getPageSize(), sort); diff --git a/src/main/java/org/springframework/data/domain/Range.java b/src/main/java/org/springframework/data/domain/Range.java index 0d9542a96..1aeea8d82 100644 --- a/src/main/java/org/springframework/data/domain/Range.java +++ b/src/main/java/org/springframework/data/domain/Range.java @@ -198,10 +198,6 @@ public final class Range> { return greaterThanLowerBound && lessThanUpperBound; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s-%s", lowerBound.toPrefixString(), upperBound.toSuffixString()); @@ -215,10 +211,6 @@ public final class Range> { return this.upperBound; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -237,10 +229,6 @@ public final class Range> { return ObjectUtils.nullSafeEquals(upperBound, range.upperBound); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(lowerBound); @@ -406,10 +394,6 @@ public final class Range> { .orElse("unbounded"); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return value.map(Object::toString).orElse("unbounded"); @@ -423,10 +407,6 @@ public final class Range> { return this.inclusive; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -444,10 +424,6 @@ public final class Range> { return ObjectUtils.nullSafeEquals(value, bound.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(value); diff --git a/src/main/java/org/springframework/data/domain/SliceImpl.java b/src/main/java/org/springframework/data/domain/SliceImpl.java index a8c0c04de..011445856 100644 --- a/src/main/java/org/springframework/data/domain/SliceImpl.java +++ b/src/main/java/org/springframework/data/domain/SliceImpl.java @@ -59,27 +59,15 @@ public class SliceImpl extends Chunk { this(content, Pageable.unpaged(), false); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#hasNext() - */ public boolean hasNext() { return hasNext; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Slice#transform(org.springframework.core.convert.converter.Converter) - */ @Override public Slice map(Function converter) { return new SliceImpl<>(getConvertedContent(converter), pageable, hasNext); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -93,10 +81,6 @@ public class SliceImpl extends Chunk { return String.format("Slice %d containing %s instances", getNumber(), contentType); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -111,10 +95,6 @@ public class SliceImpl extends Chunk { return this.hasNext == that.hasNext && super.equals(obj); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/data/domain/Sort.java b/src/main/java/org/springframework/data/domain/Sort.java index 465a8582d..580886223 100644 --- a/src/main/java/org/springframework/data/domain/Sort.java +++ b/src/main/java/org/springframework/data/domain/Sort.java @@ -220,18 +220,10 @@ public class Sort implements Streamable iterator() { return this.orders.iterator(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -246,10 +238,6 @@ public class Sort implements Streamable iterator() { @@ -726,10 +694,6 @@ public class Sort implements Streamable implements Example { return this.matcher; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -68,10 +64,6 @@ class TypedExample implements Example { return ObjectUtils.nullSafeEquals(matcher, that.matcher); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(probe); @@ -79,10 +71,6 @@ class TypedExample implements Example { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "TypedExample{" + "probe=" + probe + ", matcher=" + matcher + '}'; diff --git a/src/main/java/org/springframework/data/domain/TypedExampleMatcher.java b/src/main/java/org/springframework/data/domain/TypedExampleMatcher.java index bf768d243..4a2be0930 100644 --- a/src/main/java/org/springframework/data/domain/TypedExampleMatcher.java +++ b/src/main/java/org/springframework/data/domain/TypedExampleMatcher.java @@ -55,10 +55,6 @@ class TypedExampleMatcher implements ExampleMatcher { this.mode = mode; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnorePaths(java.lang.String...) - */ @Override public ExampleMatcher withIgnorePaths(String... ignoredPaths) { @@ -72,10 +68,6 @@ class TypedExampleMatcher implements ExampleMatcher { defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withStringMatcher(java.lang.String) - */ @Override public ExampleMatcher withStringMatcher(StringMatcher defaultStringMatcher) { @@ -85,20 +77,12 @@ class TypedExampleMatcher implements ExampleMatcher { defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase(boolean) - */ @Override public ExampleMatcher withIgnoreCase(boolean defaultIgnoreCase) { return new TypedExampleMatcher(nullHandler, defaultStringMatcher, propertySpecifiers, ignoredPaths, defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withMatcher(java.lang.String, org.springframework.data.domain.ExampleMatcher.MatcherConfigurer) - */ @Override public ExampleMatcher withMatcher(String propertyPath, GenericPropertyMatcher genericPropertyMatcher) { @@ -124,10 +108,6 @@ class TypedExampleMatcher implements ExampleMatcher { defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withTransformer(java.lang.String, org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer) - */ @Override public ExampleMatcher withTransformer(String propertyPath, PropertyValueTransformer propertyValueTransformer) { @@ -143,10 +123,6 @@ class TypedExampleMatcher implements ExampleMatcher { defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase(java.lang.String...) - */ @Override public ExampleMatcher withIgnoreCase(String... propertyPaths) { @@ -164,10 +140,6 @@ class TypedExampleMatcher implements ExampleMatcher { defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withNullHandler(org.springframework.data.domain.ExampleMatcher.NullHandler) - */ @Override public ExampleMatcher withNullHandler(NullHandler nullHandler) { @@ -176,55 +148,31 @@ class TypedExampleMatcher implements ExampleMatcher { defaultIgnoreCase, mode); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getNullHandler() - */ @Override public NullHandler getNullHandler() { return nullHandler; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getDefaultStringMatcher() - */ @Override public StringMatcher getDefaultStringMatcher() { return defaultStringMatcher; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#isIgnoreCaseEnabled() - */ @Override public boolean isIgnoreCaseEnabled() { return this.defaultIgnoreCase; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getIgnoredPaths() - */ @Override public Set getIgnoredPaths() { return ignoredPaths; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getPropertySpecifiers() - */ @Override public PropertySpecifiers getPropertySpecifiers() { return propertySpecifiers; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getMatchMode() - */ @Override public MatchMode getMatchMode() { return mode; @@ -245,10 +193,6 @@ class TypedExampleMatcher implements ExampleMatcher { return new PropertySpecifier(propertyPath); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -284,10 +228,6 @@ class TypedExampleMatcher implements ExampleMatcher { return mode == that.mode; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(nullHandler); @@ -299,10 +239,6 @@ class TypedExampleMatcher implements ExampleMatcher { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "TypedExampleMatcher{" + "nullHandler=" + nullHandler + ", defaultStringMatcher=" + defaultStringMatcher diff --git a/src/main/java/org/springframework/data/domain/Unpaged.java b/src/main/java/org/springframework/data/domain/Unpaged.java index 57b340395..22e15473b 100644 --- a/src/main/java/org/springframework/data/domain/Unpaged.java +++ b/src/main/java/org/springframework/data/domain/Unpaged.java @@ -24,91 +24,51 @@ enum Unpaged implements Pageable { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#isPaged() - */ @Override public boolean isPaged() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#previousOrFirst() - */ @Override public Pageable previousOrFirst() { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#next() - */ @Override public Pageable next() { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#hasPrevious() - */ @Override public boolean hasPrevious() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getSort() - */ @Override public Sort getSort() { return Sort.unsorted(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getPageSize() - */ @Override public int getPageSize() { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getPageNumber() - */ @Override public int getPageNumber() { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getOffset() - */ @Override public long getOffset() { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#first() - */ @Override public Pageable first() { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#withPage(int) - */ @Override public Pageable withPage(int pageNumber) { diff --git a/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java index 01fcfb7e9..ee0fd5f23 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java @@ -30,10 +30,6 @@ public class OrderAdapter extends XmlAdapter { public static final OrderAdapter INSTANCE = new OrderAdapter(); - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) - */ @Nullable @Override public OrderDto marshal(@Nullable Order order) { @@ -48,10 +44,6 @@ public class OrderAdapter extends XmlAdapter { return dto; } - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) - */ @Nullable @Override public Order unmarshal(@Nullable OrderDto source) { diff --git a/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java index 44d379312..fdb631c8b 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java @@ -32,10 +32,6 @@ import org.springframework.lang.Nullable; */ public class PageAdapter extends XmlAdapter> { - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) - */ @Nullable @Override public PageDto marshal(@Nullable Page source) { @@ -51,10 +47,6 @@ public class PageAdapter extends XmlAdapter> { return dto; } - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) - */ @Nullable @Override public Page unmarshal(@Nullable PageDto v) { diff --git a/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java index 8c10ace74..cf2b146f9 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java @@ -34,10 +34,6 @@ import org.springframework.lang.Nullable; */ class PageableAdapter extends XmlAdapter { - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) - */ @Nullable @Override public PageRequestDto marshal(@Nullable Pageable request) { @@ -56,10 +52,6 @@ class PageableAdapter extends XmlAdapter { return dto; } - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) - */ @NonNull @Override public Pageable unmarshal(@Nullable PageRequestDto v) { diff --git a/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java index 706488a3e..66681c703 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java @@ -31,10 +31,6 @@ public class SortAdapter extends XmlAdapter { public static final SortAdapter INSTANCE = new SortAdapter(); - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) - */ @Nullable @Override public SortDto marshal(@Nullable Sort source) { @@ -49,10 +45,6 @@ public class SortAdapter extends XmlAdapter { return dto; } - /* - * (non-Javadoc) - * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) - */ @NonNull @Override public Sort unmarshal(@Nullable SortDto source) { diff --git a/src/main/java/org/springframework/data/geo/Box.java b/src/main/java/org/springframework/data/geo/Box.java index 4b973bf7a..3cbfb4da0 100644 --- a/src/main/java/org/springframework/data/geo/Box.java +++ b/src/main/java/org/springframework/data/geo/Box.java @@ -81,19 +81,11 @@ public class Box implements Shape { return second; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Box [%s, %s]", first, second); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -105,10 +97,6 @@ public class Box implements Shape { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { diff --git a/src/main/java/org/springframework/data/geo/Circle.java b/src/main/java/org/springframework/data/geo/Circle.java index f99856891..e8621bd1c 100644 --- a/src/main/java/org/springframework/data/geo/Circle.java +++ b/src/main/java/org/springframework/data/geo/Circle.java @@ -91,10 +91,6 @@ public class Circle implements Shape { return radius; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -113,10 +109,6 @@ public class Circle implements Shape { return ObjectUtils.nullSafeEquals(radius, circle.radius); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(center); @@ -124,10 +116,6 @@ public class Circle implements Shape { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Circle: [center=%s, radius=%s]", center, radius); diff --git a/src/main/java/org/springframework/data/geo/CustomMetric.java b/src/main/java/org/springframework/data/geo/CustomMetric.java index 4614d5249..ae8295845 100644 --- a/src/main/java/org/springframework/data/geo/CustomMetric.java +++ b/src/main/java/org/springframework/data/geo/CustomMetric.java @@ -55,18 +55,10 @@ public class CustomMetric implements Metric { this.abbreviation = abbreviation; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.Metric#getMultiplier() - */ public double getMultiplier() { return multiplier; } - /* - * (non-Javadoc) - * @see org.springframework.data.geo.Metric#getAbbreviation() - */ @Override public String getAbbreviation() { return abbreviation; diff --git a/src/main/java/org/springframework/data/geo/Distance.java b/src/main/java/org/springframework/data/geo/Distance.java index 8ba34eb69..ec628f23f 100644 --- a/src/main/java/org/springframework/data/geo/Distance.java +++ b/src/main/java/org/springframework/data/geo/Distance.java @@ -158,10 +158,6 @@ public final class Distance implements Serializable, Comparable { return this.metric.equals(metric) ? this : new Distance(getNormalizedValue() * metric.getMultiplier(), metric); } - /* - * (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ @Override public int compareTo(@Nullable Distance that) { @@ -174,10 +170,6 @@ public final class Distance implements Serializable, Comparable { return difference == 0 ? 0 : difference > 0 ? 1 : -1; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -199,10 +191,6 @@ public final class Distance implements Serializable, Comparable { return this.metric; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -220,10 +208,6 @@ public final class Distance implements Serializable, Comparable { return ObjectUtils.nullSafeEquals(metric, distance.metric); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { int result; diff --git a/src/main/java/org/springframework/data/geo/GeoPage.java b/src/main/java/org/springframework/data/geo/GeoPage.java index fa5b90e50..554d1112a 100644 --- a/src/main/java/org/springframework/data/geo/GeoPage.java +++ b/src/main/java/org/springframework/data/geo/GeoPage.java @@ -64,10 +64,6 @@ public class GeoPage extends PageImpl> { this.averageDistance = results.getAverageDistance(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.PageImpl#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -82,10 +78,6 @@ public class GeoPage extends PageImpl> { return super.equals(obj) && ObjectUtils.nullSafeEquals(this.averageDistance, that.averageDistance); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.PageImpl#hashCode() - */ @Override public int hashCode() { return super.hashCode() + ObjectUtils.nullSafeHashCode(this.averageDistance); diff --git a/src/main/java/org/springframework/data/geo/GeoResult.java b/src/main/java/org/springframework/data/geo/GeoResult.java index 07c87f640..c1d743de3 100644 --- a/src/main/java/org/springframework/data/geo/GeoResult.java +++ b/src/main/java/org/springframework/data/geo/GeoResult.java @@ -51,10 +51,6 @@ public final class GeoResult implements Serializable { return this.distance; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -73,10 +69,6 @@ public final class GeoResult implements Serializable { return ObjectUtils.nullSafeEquals(distance, geoResult.distance); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(content); @@ -84,10 +76,6 @@ public final class GeoResult implements Serializable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("GeoResult [content: %s, distance: %s, ]", content.toString(), distance.toString()); diff --git a/src/main/java/org/springframework/data/geo/GeoResults.java b/src/main/java/org/springframework/data/geo/GeoResults.java index d3ff53581..13691f9c0 100644 --- a/src/main/java/org/springframework/data/geo/GeoResults.java +++ b/src/main/java/org/springframework/data/geo/GeoResults.java @@ -95,19 +95,11 @@ public class GeoResults implements Iterable>, Serializable { return Collections.unmodifiableList(results); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @SuppressWarnings("unchecked") public Iterator> iterator() { return (Iterator>) results.iterator(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -126,10 +118,6 @@ public class GeoResults implements Iterable>, Serializable { return ObjectUtils.nullSafeEquals(averageDistance, that.averageDistance); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(results); @@ -137,10 +125,6 @@ public class GeoResults implements Iterable>, Serializable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("GeoResults: [averageDistance: %s, results: %s]", averageDistance.toString(), diff --git a/src/main/java/org/springframework/data/geo/Metrics.java b/src/main/java/org/springframework/data/geo/Metrics.java index 8c6b90d17..3baea651e 100644 --- a/src/main/java/org/springframework/data/geo/Metrics.java +++ b/src/main/java/org/springframework/data/geo/Metrics.java @@ -41,18 +41,10 @@ public enum Metrics implements Metric { this.abbreviation = abbreviation; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.Metric#getMultiplier() - */ public double getMultiplier() { return multiplier; } - /* - * (non-Javadoc) - * @see org.springframework.data.geo.Metric#getAbbreviation() - */ @Override public String getAbbreviation() { return abbreviation; diff --git a/src/main/java/org/springframework/data/geo/Point.java b/src/main/java/org/springframework/data/geo/Point.java index b0df7ddd5..c4c1df80e 100644 --- a/src/main/java/org/springframework/data/geo/Point.java +++ b/src/main/java/org/springframework/data/geo/Point.java @@ -80,10 +80,6 @@ public class Point implements Serializable { return y; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -98,10 +94,6 @@ public class Point implements Serializable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -124,10 +116,6 @@ public class Point implements Serializable { return true; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format(Locale.ENGLISH, "Point [x=%f, y=%f]", x, y); diff --git a/src/main/java/org/springframework/data/geo/Polygon.java b/src/main/java/org/springframework/data/geo/Polygon.java index a01b617da..9fe6116f2 100644 --- a/src/main/java/org/springframework/data/geo/Polygon.java +++ b/src/main/java/org/springframework/data/geo/Polygon.java @@ -92,18 +92,10 @@ public class Polygon implements Iterable, Shape { return this.points; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return this.points.iterator(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -118,19 +110,11 @@ public class Polygon implements Iterable, Shape { return ObjectUtils.nullSafeEquals(points, that.points); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(points); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Polygon: [%s]", StringUtils.collectionToCommaDelimitedString(points)); diff --git a/src/main/java/org/springframework/data/geo/format/DistanceFormatter.java b/src/main/java/org/springframework/data/geo/format/DistanceFormatter.java index e067b3f2f..5680f02cc 100644 --- a/src/main/java/org/springframework/data/geo/format/DistanceFormatter.java +++ b/src/main/java/org/springframework/data/geo/format/DistanceFormatter.java @@ -57,29 +57,17 @@ public enum DistanceFormatter implements Converter, Formatter< SUPPORTED_METRICS = Collections.unmodifiableMap(metrics); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public final Distance convert(String source) { return source == null ? null : doConvert(source.trim().toLowerCase(Locale.US)); } - /* - * (non-Javadoc) - * @see org.springframework.format.Printer#print(java.lang.Object, java.util.Locale) - */ @Override public String print(Distance distance, Locale locale) { return distance == null ? null : String.format("%s%s", distance.getValue(), distance.getUnit().toLowerCase(locale)); } - /* - * (non-Javadoc) - * @see org.springframework.format.Parser#parse(java.lang.String, java.util.Locale) - */ @Override public Distance parse(String text, Locale locale) throws ParseException { return doConvert(text.trim().toLowerCase(locale)); diff --git a/src/main/java/org/springframework/data/geo/format/PointFormatter.java b/src/main/java/org/springframework/data/geo/format/PointFormatter.java index ee30c2ebe..3dbea7f99 100644 --- a/src/main/java/org/springframework/data/geo/format/PointFormatter.java +++ b/src/main/java/org/springframework/data/geo/format/PointFormatter.java @@ -37,10 +37,6 @@ public enum PointFormatter implements Converter, Formatter private static final String INVALID_FORMAT = "Expected two doubles separated by a comma but got '%s'!"; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @NonNull @Override public Point convert(String source) { @@ -63,19 +59,11 @@ public enum PointFormatter implements Converter, Formatter } } - /* - * (non-Javadoc) - * @see org.springframework.format.Printer#print(java.lang.Object, java.util.Locale) - */ @Override public String print(Point point, Locale locale) { return point == null ? null : String.format("%s,%s", point.getY(), point.getX()); } - /* - * (non-Javadoc) - * @see org.springframework.format.Parser#parse(java.lang.String, java.util.Locale) - */ @Override public Point parse(String text, Locale locale) throws ParseException { return convert(text); diff --git a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java index f615ade57..09b3b6968 100755 --- a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java +++ b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java @@ -81,34 +81,18 @@ public class AnnotationRevisionMetadata> implem this.revisionType = revisionType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.RevisionMetadata#getRevisionNumber() - */ public Optional getRevisionNumber() { return revisionNumber.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionDate() - */ public Optional getRevisionInstant() { return revisionDate.get().map(AnnotationRevisionMetadata::convertToInstant); } - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionDate() - */ public RevisionType getRevisionType() { return revisionType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.history.RevisionMetadata#getDelegate() - */ @SuppressWarnings("unchecked") public T getDelegate() { return (T) entity; diff --git a/src/main/java/org/springframework/data/history/Revision.java b/src/main/java/org/springframework/data/history/Revision.java index 790fc1eb2..e4e47adff 100755 --- a/src/main/java/org/springframework/data/history/Revision.java +++ b/src/main/java/org/springframework/data/history/Revision.java @@ -96,10 +96,6 @@ public final class Revision, T> implements Comp return metadata.getRequiredRevisionInstant(); } - /* - * (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ public int compareTo(@Nullable Revision that) { if (that == null) { @@ -110,10 +106,6 @@ public final class Revision, T> implements Comp Comparable::compareTo).orElse(-1); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Revision %s of entity %s - Revision metadata %s", @@ -128,10 +120,6 @@ public final class Revision, T> implements Comp return this.entity; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -150,10 +138,6 @@ public final class Revision, T> implements Comp return ObjectUtils.nullSafeEquals(entity, revision.entity); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(metadata); diff --git a/src/main/java/org/springframework/data/history/Revisions.java b/src/main/java/org/springframework/data/history/Revisions.java index 466757bdd..dcf810824 100644 --- a/src/main/java/org/springframework/data/history/Revisions.java +++ b/src/main/java/org/springframework/data/history/Revisions.java @@ -102,10 +102,6 @@ public class Revisions, T> implements Streamabl return new Revisions<>(revisions, !latestLast); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator> iterator() { return revisions.iterator(); } diff --git a/src/main/java/org/springframework/data/mapping/Alias.java b/src/main/java/org/springframework/data/mapping/Alias.java index 0dbfe15d9..d205a1fb5 100644 --- a/src/main/java/org/springframework/data/mapping/Alias.java +++ b/src/main/java/org/springframework/data/mapping/Alias.java @@ -134,10 +134,6 @@ public final class Alias { return isPresent() && type.isInstance(value) ? (T) value : null; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return isPresent() ? value.toString() : "NONE"; @@ -147,10 +143,6 @@ public final class Alias { return this.value; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -165,10 +157,6 @@ public final class Alias { return ObjectUtils.nullSafeEquals(value, alias.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(value); diff --git a/src/main/java/org/springframework/data/mapping/PreferredConstructor.java b/src/main/java/org/springframework/data/mapping/PreferredConstructor.java index c0d213653..476ffc2a9 100644 --- a/src/main/java/org/springframework/data/mapping/PreferredConstructor.java +++ b/src/main/java/org/springframework/data/mapping/PreferredConstructor.java @@ -286,10 +286,6 @@ public class PreferredConstructor> { return this.hasSpelExpression.get(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -316,10 +312,6 @@ public class PreferredConstructor> { return ObjectUtils.nullSafeEquals(entity, parameter.entity); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(name); diff --git a/src/main/java/org/springframework/data/mapping/PropertyPath.java b/src/main/java/org/springframework/data/mapping/PropertyPath.java index 7b87f8bb3..bf5ea2ad9 100644 --- a/src/main/java/org/springframework/data/mapping/PropertyPath.java +++ b/src/main/java/org/springframework/data/mapping/PropertyPath.java @@ -213,10 +213,6 @@ public class PropertyPath implements Streamable { return PropertyPath.from(lookup, owningType); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return new Iterator() { @@ -246,10 +242,6 @@ public class PropertyPath implements Streamable { }; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -284,10 +276,6 @@ public class PropertyPath implements Streamable { return ObjectUtils.nullSafeEquals(next, that.next); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(owningType); @@ -473,10 +461,6 @@ public class PropertyPath implements Streamable { throw exception; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s.%s", owningType.getType().getSimpleName(), toDotPath()); @@ -504,10 +488,6 @@ public class PropertyPath implements Streamable { return this.path; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -526,10 +506,6 @@ public class PropertyPath implements Streamable { return ObjectUtils.nullSafeEquals(path, key.path); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(type); @@ -537,10 +513,6 @@ public class PropertyPath implements Streamable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "PropertyPath.Key(type=" + this.getType() + ", path=" + this.getPath() + ")"; diff --git a/src/main/java/org/springframework/data/mapping/PropertyReferenceException.java b/src/main/java/org/springframework/data/mapping/PropertyReferenceException.java index a97a032c5..03ef85c51 100644 --- a/src/main/java/org/springframework/data/mapping/PropertyReferenceException.java +++ b/src/main/java/org/springframework/data/mapping/PropertyReferenceException.java @@ -92,10 +92,6 @@ public class PropertyReferenceException extends RuntimeException { return propertyMatches.get(); } - /* - * (non-Javadoc) - * @see java.lang.Throwable#getMessage() - */ @Override public String getMessage() { diff --git a/src/main/java/org/springframework/data/mapping/TargetAwareIdentifierAccessor.java b/src/main/java/org/springframework/data/mapping/TargetAwareIdentifierAccessor.java index 5226bbb32..87ade04f8 100644 --- a/src/main/java/org/springframework/data/mapping/TargetAwareIdentifierAccessor.java +++ b/src/main/java/org/springframework/data/mapping/TargetAwareIdentifierAccessor.java @@ -32,10 +32,6 @@ public abstract class TargetAwareIdentifierAccessor implements IdentifierAccesso this.target = target; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.IdentifierAccessor#getRequiredIdentifier() - */ @Override public Object getRequiredIdentifier() { diff --git a/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java b/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java index 0da26e157..5fc26d89f 100644 --- a/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java +++ b/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java @@ -59,10 +59,6 @@ class DefaultEntityCallbacks implements EntityCallbacks { this.callbackDiscoverer = new EntityCallbackDiscoverer(beanFactory); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.callback.EntityCallbacks#callback(java.lang.Class, java.lang.Object, java.lang.Object) - */ @Override public T callback(Class callbackType, T entity, Object... args) { @@ -91,10 +87,6 @@ class DefaultEntityCallbacks implements EntityCallbacks { return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.callback.EntityCallbacks#addEntityCallback(org.springframework.data.mapping.callback.EntityCallback) - */ @Override public void addEntityCallback(EntityCallback callback) { this.callbackDiscoverer.addEntityCallback(callback); diff --git a/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java b/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java index 0d288b6cb..e81903240 100644 --- a/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java +++ b/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java @@ -60,10 +60,6 @@ class DefaultReactiveEntityCallbacks implements ReactiveEntityCallbacks { this.callbackDiscoverer = new EntityCallbackDiscoverer(beanFactory); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.callback.ReactiveEntityCallbacks#callback(java.lang.Class, java.lang.Object, java.lang.Object) - */ @Override public Mono callback(Class callbackType, T entity, Object... args) { @@ -94,10 +90,6 @@ class DefaultReactiveEntityCallbacks implements ReactiveEntityCallbacks { return deferredCallbackChain; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.callback.EntityCallbacks#addEntityCallback(org.springframework.data.mapping.callback.EntityCallback) - */ @Override public void addEntityCallback(EntityCallback callback) { this.callbackDiscoverer.addEntityCallback(callback); 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 616598ca5..5e4806238 100644 --- a/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java +++ b/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java @@ -415,10 +415,6 @@ class EntityCallbackDiscoverer { this.entityType = entityType; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object other) { @@ -432,10 +428,6 @@ class EntityCallbackDiscoverer { && ObjectUtils.nullSafeEquals(this.entityType, otherKey.entityType)); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return this.callbackType.hashCode() * 17 + ObjectUtils.nullSafeHashCode(this.entityType); diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java index 5518d22b6..38f748edd 100644 --- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java +++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java @@ -121,19 +121,11 @@ public abstract class AbstractMappingContext getPersistentEntities() { @@ -198,19 +186,11 @@ public abstract class AbstractMappingContext type) { return getPersistentEntity(ClassTypeInformation.from(type)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.MappingContext#hasPersistentEntityFor(java.lang.Class) - */ @Override public boolean hasPersistentEntityFor(Class type) { @@ -221,10 +201,6 @@ public abstract class AbstractMappingContext type) { @@ -264,10 +240,6 @@ public abstract class AbstractMappingContext getPersistentPropertyPath(PropertyPath propertyPath) { return persistentPropertyPathFactory.from(propertyPath); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.MappingContext#getPersistentPropertyPath(java.lang.String, java.lang.Class) - */ @Override public PersistentPropertyPath

getPersistentPropertyPath(String propertyPath, Class type) { return persistentPropertyPathFactory.from(type, propertyPath); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.MappingContext#findPersistentPropertyPath(java.lang.Class, java.util.function.Predicate) - */ @Override public PersistentPropertyPaths findPersistentPropertyPaths(Class type, Predicate predicate) { @@ -439,10 +399,6 @@ public abstract class AbstractMappingContext> getManagedTypes() { @@ -475,10 +431,6 @@ public abstract class AbstractMappingContext> implements return new DefaultPersistentPropertyPath<>(properties); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#toDotPath() - */ @Nullable public String toDotPath() { return toPath(DEFAULT_DELIMITER, DEFAULT_CONVERTER); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#toDotPath(org.springframework.core.convert.converter.Converter) - */ @Nullable public String toDotPath(Converter converter) { return toPath(DEFAULT_DELIMITER, converter); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#toPath(java.lang.String) - */ @Nullable public String toPath(String delimiter) { return toPath(delimiter, DEFAULT_CONVERTER); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#toPath(java.lang.String, org.springframework.core.convert.converter.Converter) - */ @Nullable public String toPath(String delimiter, Converter converter) { @@ -136,28 +120,16 @@ class DefaultPersistentPropertyPath

> implements return result.isEmpty() ? null : result; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#getLeafProperty() - */ @Nullable public P getLeafProperty() { return properties.isEmpty() ? null : properties.get(properties.size() - 1); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#getBaseProperty() - */ @Nullable public P getBaseProperty() { return properties.isEmpty() ? null : properties.get(0); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#isBasePathOf(org.springframework.data.mapping.context.PersistentPropertyPath) - */ public boolean isBasePathOf(PersistentPropertyPath

path) { Assert.notNull(path, "PersistentPropertyPath must not be null!"); @@ -180,10 +152,6 @@ class DefaultPersistentPropertyPath

> implements return true; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#getExtensionForBaseOf(org.springframework.data.mapping.context.PersistentPropertyPath) - */ public PersistentPropertyPath

getExtensionForBaseOf(PersistentPropertyPath

base) { if (!base.isBasePathOf(this)) { @@ -204,10 +172,6 @@ class DefaultPersistentPropertyPath

> implements return new DefaultPersistentPropertyPath<>(result); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#getParentPath() - */ public PersistentPropertyPath

getParentPath() { var size = properties.size(); @@ -215,18 +179,10 @@ class DefaultPersistentPropertyPath

> implements return size == 0 ? this : new DefaultPersistentPropertyPath<>(properties.subList(0, size - 1)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.PersistentPropertyPath#getLength() - */ public int getLength() { return properties.size(); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator

iterator() { return properties.iterator(); } @@ -245,10 +201,6 @@ class DefaultPersistentPropertyPath

> implements .anyMatch(property -> type.equals(property.getTypeInformation().getActualType())); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -263,19 +215,11 @@ class DefaultPersistentPropertyPath

> implements return ObjectUtils.nullSafeEquals(properties, that.properties); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(properties); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @Nullable public String toString() { diff --git a/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java b/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java index bc7e93cab..2760deb06 100644 --- a/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java +++ b/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java @@ -166,10 +166,6 @@ public class PersistentEntities implements Streamable>> iterator() { diff --git a/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java b/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java index 00c6b9e65..a0d93c3d6 100644 --- a/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java +++ b/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java @@ -293,10 +293,6 @@ class PersistentPropertyPathFactory, P extends return this.path; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -315,10 +311,6 @@ class PersistentPropertyPathFactory, P extends return ObjectUtils.nullSafeEquals(path, that.path); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(type); @@ -326,10 +318,6 @@ class PersistentPropertyPathFactory, P extends return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "PersistentPropertyPathFactory.TypeAndPath(type=" + this.getType() + ", path=" + this.getPath() + ")"; @@ -367,28 +355,16 @@ class PersistentPropertyPathFactory, P extends return new DefaultPersistentPropertyPaths<>(type, sorted); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPaths#getFirst() - */ @Override public Optional> getFirst() { return isEmpty() ? Optional.empty() : Optional.of(iterator().next()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPaths#contains(java.lang.String) - */ @Override public boolean contains(String path) { return contains(PropertyPath.from(path, type)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPaths#contains(org.springframework.data.mapping.PropertyPath) - */ @Override public boolean contains(PropertyPath path) { @@ -403,19 +379,11 @@ class PersistentPropertyPathFactory, P extends return stream().anyMatch(it -> dotPath.equals(it.toDotPath())); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator> iterator() { return paths.iterator(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPaths#dropPathIfSegmentMatches(java.util.function.Predicate) - */ @Override public PersistentPropertyPaths dropPathIfSegmentMatches(Predicate predicate) { @@ -428,10 +396,6 @@ class PersistentPropertyPathFactory, P extends return paths.equals(this.paths) ? this : new DefaultPersistentPropertyPaths<>(type, paths); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "PersistentPropertyPathFactory.DefaultPersistentPropertyPaths(type=" + this.type + ", paths=" + this.paths diff --git a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java index a689f0319..f1a7e70a1 100644 --- a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java +++ b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java @@ -113,55 +113,31 @@ public abstract class AbstractPersistentProperty

protected abstract Association

createAssociation(); - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getOwner() - */ @Override public PersistentEntity getOwner() { return this.owner; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getName() - */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getType() - */ @Override public Class getType() { return information.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getRawType() - */ @Override public Class getRawType() { return this.rawType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getTypeInformation() - */ @Override public TypeInformation getTypeInformation() { return information; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getPersistentEntityTypeInformation() - */ @Override public Iterable> getPersistentEntityTypeInformation() { @@ -176,105 +152,61 @@ public abstract class AbstractPersistentProperty

return entityTypeInformation.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getGetter() - */ @Nullable @Override public Method getGetter() { return this.getter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getSetter() - */ @Nullable @Override public Method getSetter() { return this.setter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getWither() - */ @Nullable @Override public Method getWither() { return this.wither; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getField() - */ @Nullable public Field getField() { return this.field; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getSpelExpression() - */ @Override @Nullable public String getSpelExpression() { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isTransient() - */ @Override public boolean isTransient() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isWritable() - */ @Override public boolean isWritable() { return !isTransient(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isImmutable() - */ @Override public boolean isImmutable() { return immutable; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isAssociation() - */ @Override public boolean isAssociation() { return isAssociation.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getAssociation() - */ @Nullable @Override public Association

getAssociation() { return association.orElse(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getAssociationTargetType() - */ @Nullable @Override public Class getAssociationTargetType() { @@ -284,66 +216,38 @@ public abstract class AbstractPersistentProperty

return result != null ? result.getType() : null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getAssociationTargetTypeInformation() - */ @Nullable @Override public TypeInformation getAssociationTargetTypeInformation() { return associationTargetType.getNullable(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isCollectionLike() - */ @Override public boolean isCollectionLike() { return information.isCollectionLike(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isMap() - */ @Override public boolean isMap() { return Map.class.isAssignableFrom(getType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isArray() - */ @Override public boolean isArray() { return getType().isArray(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#isEntity() - */ @Override public boolean isEntity() { return !isTransient() && !entityTypeInformation.get().isEmpty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getComponentType() - */ @Nullable @Override public Class getComponentType() { return isMap() || isCollectionLike() ? information.getRequiredComponentType().getType() : null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getMapValueType() - */ @Nullable @Override public Class getMapValueType() { @@ -360,19 +264,11 @@ public abstract class AbstractPersistentProperty

return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentProperty#getActualType() - */ @Override public Class getActualType() { return getActualTypeInformation().getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#usePropertyAccess() - */ public boolean usePropertyAccess() { return usePropertyAccess.get(); } @@ -387,10 +283,6 @@ public abstract class AbstractPersistentProperty

return targetType == null ? information.getRequiredActualType() : targetType; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -405,19 +297,11 @@ public abstract class AbstractPersistentProperty

return this.property.equals(that.property); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return this.hashCode.get(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return property.toString(); diff --git a/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java index 843e96aa7..6c5bcb28d 100644 --- a/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java +++ b/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java @@ -199,18 +199,10 @@ public abstract class AnnotationBasedPersistentProperty

A findPropertyOrOwnerAnnotation(Class annotationType) { @@ -289,29 +273,17 @@ public abstract class AnnotationBasedPersistentProperty

getAssociationTargetTypeInformation() { return associationTargetType.getNullable(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.AbstractPersistentProperty#toString() - */ @Override public String toString() { diff --git a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java index 5c292bb16..ec4a556bc 100644 --- a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java +++ b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java @@ -127,85 +127,45 @@ public class BasicPersistentEntity> implement .anyMatch(it -> !(isConstructorArgument(it) || it.isTransient()))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getPersistenceConstructor() - */ @Nullable public PreferredConstructor getPersistenceConstructor() { return constructor; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#isConstructorArgument(org.springframework.data.mapping.PersistentProperty) - */ public boolean isConstructorArgument(PersistentProperty property) { return constructor != null && constructor.isConstructorParameter(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#isIdProperty(org.springframework.data.mapping.PersistentProperty) - */ public boolean isIdProperty(PersistentProperty property) { return idProperty != null && idProperty.equals(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#isVersionProperty(org.springframework.data.mapping.PersistentProperty) - */ public boolean isVersionProperty(PersistentProperty property) { return versionProperty != null && versionProperty.equals(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getName() - */ public String getName() { return getType().getName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getIdProperty() - */ @Nullable public P getIdProperty() { return idProperty; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getVersionProperty() - */ @Nullable public P getVersionProperty() { return versionProperty; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#hasIdProperty() - */ public boolean hasIdProperty() { return idProperty != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#hasVersionProperty() - */ public boolean hasVersionProperty() { return versionProperty != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.MutablePersistentEntity#addPersistentProperty(P) - */ public void addPersistentProperty(P property) { Assert.notNull(property, "Property must not be null!"); @@ -245,10 +205,6 @@ public class BasicPersistentEntity> implement } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.MutablePersistentEntity#setEvaluationContextProvider(org.springframework.data.spel.EvaluationContextProvider) - */ @Override public void setEvaluationContextProvider(EvaluationContextProvider provider) { this.evaluationContextProvider = provider; @@ -277,10 +233,6 @@ public class BasicPersistentEntity> implement return property; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.MutablePersistentEntity#addAssociation(org.springframework.data.mapping.model.Association) - */ public void addAssociation(Association

association) { Assert.notNull(association, "Association must not be null!"); @@ -288,20 +240,12 @@ public class BasicPersistentEntity> implement associations.add(association); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getPersistentProperty(java.lang.String) - */ @Override @Nullable public P getPersistentProperty(String name) { return propertyCache.get(name); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getPersistentProperties(java.lang.String) - */ @Override public Iterable

getPersistentProperties(Class annotationType) { @@ -324,34 +268,18 @@ public class BasicPersistentEntity> implement .filter(it -> it.isAnnotationPresent(annotationType)).collect(Collectors.toList()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getType() - */ public Class getType() { return information.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getTypeAlias() - */ public Alias getTypeAlias() { return typeAlias.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getTypeInformation() - */ public TypeInformation getTypeInformation() { return information; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#doWithProperties(org.springframework.data.mapping.PropertyHandler) - */ public void doWithProperties(PropertyHandler

handler) { Assert.notNull(handler, "PropertyHandler must not be null!"); @@ -361,10 +289,6 @@ public class BasicPersistentEntity> implement } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#doWithProperties(org.springframework.data.mapping.PropertyHandler.Simple) - */ @Override public void doWithProperties(SimplePropertyHandler handler) { @@ -375,10 +299,6 @@ public class BasicPersistentEntity> implement } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#doWithAssociations(org.springframework.data.mapping.AssociationHandler) - */ public void doWithAssociations(AssociationHandler

handler) { Assert.notNull(handler, "Handler must not be null!"); @@ -388,10 +308,6 @@ public class BasicPersistentEntity> implement } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#doWithAssociations(org.springframework.data.mapping.SimpleAssociationHandler) - */ public void doWithAssociations(SimpleAssociationHandler handler) { Assert.notNull(handler, "Handler must not be null!"); @@ -401,20 +317,12 @@ public class BasicPersistentEntity> implement } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#findAnnotation(java.lang.Class) - */ @Nullable @Override public A findAnnotation(Class annotationType) { return doFindAnnotation(annotationType).orElse(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#isAnnotationPresent(java.lang.Class) - */ @Override public boolean isAnnotationPresent(Class annotationType) { return doFindAnnotation(annotationType).isPresent(); @@ -427,10 +335,6 @@ public class BasicPersistentEntity> implement it -> Optional.ofNullable(AnnotatedElementUtils.findMergedAnnotation(getType(), it))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.MutablePersistentEntity#verify() - */ public void verify() { if (comparator != null) { @@ -439,19 +343,11 @@ public class BasicPersistentEntity> implement } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.MutablePersistentEntity#setPersistentPropertyAccessorFactory(org.springframework.data.mapping.model.PersistentPropertyAccessorFactory) - */ @Override public void setPersistentPropertyAccessorFactory(PersistentPropertyAccessorFactory factory) { this.propertyAccessorFactory = factory; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getPropertyAccessor(java.lang.Object) - */ @Override public PersistentPropertyAccessor getPropertyAccessor(B bean) { @@ -460,19 +356,11 @@ public class BasicPersistentEntity> implement return propertyAccessorFactory.getPropertyAccessor(this, bean); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getPropertyPathAccessor(java.lang.Object) - */ @Override public PersistentPropertyPathAccessor getPropertyPathAccessor(B bean) { return new SimplePersistentPropertyPathAccessor<>(getPropertyAccessor(bean)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#getIdentifierAccessor(java.lang.Object) - */ @Override public IdentifierAccessor getIdentifierAccessor(Object bean) { @@ -485,10 +373,6 @@ public class BasicPersistentEntity> implement return hasIdProperty() ? new IdPropertyIdentifierAccessor(this, bean) : new AbsentIdentifierAccessor(bean); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#isNew(java.lang.Object) - */ @Override public boolean isNew(Object bean) { @@ -497,28 +381,16 @@ public class BasicPersistentEntity> implement return isNewStrategy.get().isNew(bean); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#isImmutable() - */ @Override public boolean isImmutable() { return isImmutable.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentEntity#requiresPropertyPopulation() - */ @Override public boolean requiresPropertyPopulation() { return requiresPropertyPopulation.get(); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator

iterator() { @@ -614,10 +486,6 @@ public class BasicPersistentEntity> implement super(target); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.IdentifierAccessor#getIdentifier() - */ @Override @Nullable public Object getIdentifier() { @@ -640,10 +508,6 @@ public class BasicPersistentEntity> implement this.delegate = delegate; } - /* - * (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ public int compare(@Nullable Association

left, @Nullable Association

right) { if (left == null) { diff --git a/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java b/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java index fef66e24c..bf5ea5313 100644 --- a/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java +++ b/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java @@ -52,10 +52,6 @@ class BeanWrapper implements PersistentPropertyAccessor { this.bean = bean; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#setProperty(org.springframework.data.mapping.PersistentProperty, java.util.Optional) - */ @SuppressWarnings("unchecked") public void setProperty(PersistentProperty property, @Nullable Object value) { @@ -103,10 +99,6 @@ class BeanWrapper implements PersistentPropertyAccessor { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#getProperty(org.springframework.data.mapping.PersistentProperty) - */ @Nullable public Object getProperty(PersistentProperty property) { return getProperty(property, property.getType()); @@ -147,10 +139,6 @@ class BeanWrapper implements PersistentPropertyAccessor { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#getBean() - */ public T getBean() { return bean; } diff --git a/src/main/java/org/springframework/data/mapping/model/BeanWrapperPropertyAccessorFactory.java b/src/main/java/org/springframework/data/mapping/model/BeanWrapperPropertyAccessorFactory.java index 73b1a81a4..6d4349372 100644 --- a/src/main/java/org/springframework/data/mapping/model/BeanWrapperPropertyAccessorFactory.java +++ b/src/main/java/org/springframework/data/mapping/model/BeanWrapperPropertyAccessorFactory.java @@ -27,19 +27,11 @@ public enum BeanWrapperPropertyAccessorFactory implements PersistentPropertyAcce INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.PersistentPropertyAccessorFactory#getPropertyAccessor(org.springframework.data.mapping.PersistentEntity, java.lang.Object) - */ @Override public PersistentPropertyAccessor getPropertyAccessor(PersistentEntity entity, T bean) { return new BeanWrapper<>(bean); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.PersistentPropertyAccessorFactory#isSupported(org.springframework.data.mapping.PersistentEntity) - */ @Override public boolean isSupported(PersistentEntity entity) { return true; diff --git a/src/main/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategy.java b/src/main/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategy.java index faa52bb36..802019d08 100644 --- a/src/main/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategy.java +++ b/src/main/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategy.java @@ -31,10 +31,6 @@ public class CamelCaseAbbreviatingFieldNamingStrategy extends CamelCaseSplitting super(""); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.CamelCaseSplittingFieldNamingStrategy#preparePart(java.lang.String) - */ @Override protected String preparePart(String part) { return part.substring(0, 1); diff --git a/src/main/java/org/springframework/data/mapping/model/CamelCaseSplittingFieldNamingStrategy.java b/src/main/java/org/springframework/data/mapping/model/CamelCaseSplittingFieldNamingStrategy.java index 481493a6e..abcc5b6a2 100644 --- a/src/main/java/org/springframework/data/mapping/model/CamelCaseSplittingFieldNamingStrategy.java +++ b/src/main/java/org/springframework/data/mapping/model/CamelCaseSplittingFieldNamingStrategy.java @@ -45,10 +45,6 @@ public class CamelCaseSplittingFieldNamingStrategy implements FieldNamingStrateg this.delimiter = delimiter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.FieldNamingStrategy#getFieldName(org.springframework.data.mapping.PersistentProperty) - */ @Override public String getFieldName(PersistentProperty property) { diff --git a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java index a92211f49..95a466e5e 100644 --- a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java +++ b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiator.java @@ -71,10 +71,6 @@ class ClassGeneratingEntityInstantiator implements EntityInstantiator { this.generator = new ObjectInstantiatorClassGenerator(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.EntityInstantiator#createInstance(org.springframework.data.mapping.PersistentEntity, org.springframework.data.mapping.model.ParameterValueProvider) - */ @Override public , P extends PersistentProperty

> T createInstance(E entity, ParameterValueProvider

provider) { @@ -235,10 +231,6 @@ class ClassGeneratingEntityInstantiator implements EntityInstantiator { this.instantiator = instantiator; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.EntityInstantiator#createInstance(org.springframework.data.mapping.PersistentEntity, org.springframework.data.mapping.model.ParameterValueProvider) - */ @Override @SuppressWarnings("unchecked") public , P extends PersistentProperty

> T createInstance(E entity, @@ -307,10 +299,6 @@ class ClassGeneratingEntityInstantiator implements EntityInstantiator { return new MappingInstantiationExceptionEntityInstantiator(typeToCreate); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.EntityInstantiator#createInstance(org.springframework.data.mapping.PersistentEntity, org.springframework.data.mapping.model.ParameterValueProvider) - */ @Override public , P extends PersistentProperty

> T createInstance(E entity, ParameterValueProvider

provider) { diff --git a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java index 33d103e8a..611ddb496 100644 --- a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java +++ b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java @@ -75,10 +75,6 @@ public class ClassGeneratingPropertyAccessorFactory implements PersistentPropert private volatile Map, Class>> propertyAccessorClasses = new HashMap<>( 32); - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.PersistentPropertyAccessorFactory#getPropertyAccessor(org.springframework.data.mapping.PersistentEntity, java.lang.Object) - */ @Override public PersistentPropertyAccessor getPropertyAccessor(PersistentEntity entity, T bean) { @@ -1403,10 +1399,6 @@ public class ClassGeneratingPropertyAccessorFactory implements PersistentPropert this.hash = hash; } - /* - * (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ @Override public int compareTo(PropertyStackAddress o) { return Integer.compare(hash, o.hash); diff --git a/src/main/java/org/springframework/data/mapping/model/ConvertingPropertyAccessor.java b/src/main/java/org/springframework/data/mapping/model/ConvertingPropertyAccessor.java index 2d121e5ef..99f3d732b 100644 --- a/src/main/java/org/springframework/data/mapping/model/ConvertingPropertyAccessor.java +++ b/src/main/java/org/springframework/data/mapping/model/ConvertingPropertyAccessor.java @@ -54,19 +54,11 @@ public class ConvertingPropertyAccessor extends SimplePersistentPropertyPathA this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#setProperty(org.springframework.data.mapping.PersistentProperty, java.lang.Object) - */ @Override public void setProperty(PersistentProperty property, @Nullable Object value) { accessor.setProperty(property, convertIfNecessary(value, property.getType())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#setProperty(org.springframework.data.mapping.PersistentPropertyPath, java.lang.Object) - */ @Override public void setProperty(PersistentPropertyPath> path, @Nullable Object value) { @@ -91,10 +83,6 @@ public class ConvertingPropertyAccessor extends SimplePersistentPropertyPathA return convertIfNecessary(getProperty(property), targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SimplePersistentPropertyPathAccessor#getTypedProperty(org.springframework.data.mapping.PersistentProperty, java.lang.Class) - */ @Nullable @Override protected S getTypedProperty(PersistentProperty property, Class type) { diff --git a/src/main/java/org/springframework/data/mapping/model/DefaultSpELExpressionEvaluator.java b/src/main/java/org/springframework/data/mapping/model/DefaultSpELExpressionEvaluator.java index 61e244555..c04e87d86 100644 --- a/src/main/java/org/springframework/data/mapping/model/DefaultSpELExpressionEvaluator.java +++ b/src/main/java/org/springframework/data/mapping/model/DefaultSpELExpressionEvaluator.java @@ -42,10 +42,6 @@ public class DefaultSpELExpressionEvaluator implements SpELExpressionEvaluator { this.factory = factory; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELExpressionEvaluator#evaluate(java.lang.String) - */ @Nullable @SuppressWarnings("unchecked") public T evaluate(String expression) { diff --git a/src/main/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessor.java b/src/main/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessor.java index e1cca877c..e6519e0ef 100644 --- a/src/main/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessor.java +++ b/src/main/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessor.java @@ -54,10 +54,6 @@ public class IdPropertyIdentifierAccessor extends TargetAwareIdentifierAccessor this.accessor = entity.getPropertyAccessor(target); } - /* - * (non-Javadoc) - * @see org.springframework.data.keyvalue.core.IdentifierAccessor#getIdentifier() - */ @Nullable public Object getIdentifier() { return accessor.getProperty(idProperty); 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 dd800e185..41831d28c 100644 --- a/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java +++ b/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java @@ -66,10 +66,6 @@ public class InstantiationAwarePropertyAccessor implements PersistentProperty this.bean = bean; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#setProperty(org.springframework.data.mapping.PersistentProperty, java.lang.Object) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setProperty(PersistentProperty property, @Nullable Object value) { @@ -124,20 +120,12 @@ public class InstantiationAwarePropertyAccessor implements PersistentProperty }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#getProperty(org.springframework.data.mapping.PersistentProperty) - */ @Nullable @Override public Object getProperty(PersistentProperty property) { return delegateFunction.apply(bean).getProperty(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#getBean() - */ @Override public T getBean() { return this.bean; diff --git a/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessorFactory.java b/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessorFactory.java index abc8ce70c..5088d4b41 100644 --- a/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessorFactory.java +++ b/src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessorFactory.java @@ -37,20 +37,12 @@ public class InstantiationAwarePropertyAccessorFactory implements PersistentProp this.instantiators = instantiators; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.PersistentPropertyAccessorFactory#getPropertyAccessor(org.springframework.data.mapping.PersistentEntity, java.lang.Object) - */ @Override public PersistentPropertyAccessor getPropertyAccessor(PersistentEntity entity, T bean) { return new InstantiationAwarePropertyAccessor<>(bean, it -> delegate.getPropertyAccessor(entity, it), instantiators); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.PersistentPropertyAccessorFactory#isSupported(org.springframework.data.mapping.PersistentEntity) - */ @Override public boolean isSupported(PersistentEntity entity) { return delegate.isSupported(entity); diff --git a/src/main/java/org/springframework/data/mapping/model/KotlinClassGeneratingEntityInstantiator.java b/src/main/java/org/springframework/data/mapping/model/KotlinClassGeneratingEntityInstantiator.java index 2b4ca7a2b..b517eee7e 100644 --- a/src/main/java/org/springframework/data/mapping/model/KotlinClassGeneratingEntityInstantiator.java +++ b/src/main/java/org/springframework/data/mapping/model/KotlinClassGeneratingEntityInstantiator.java @@ -42,10 +42,6 @@ import org.springframework.lang.Nullable; */ class KotlinClassGeneratingEntityInstantiator extends ClassGeneratingEntityInstantiator { - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.ClassGeneratingEntityInstantiator#doCreateEntityInstantiator(org.springframework.data.mapping.PersistentEntity) - */ @Override protected EntityInstantiator doCreateEntityInstantiator(PersistentEntity entity) { @@ -190,10 +186,6 @@ class KotlinClassGeneratingEntityInstantiator extends ClassGeneratingEntityInsta this.synthetic = constructor.getConstructor(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.EntityInstantiator#createInstance(org.springframework.data.mapping.PersistentEntity, org.springframework.data.mapping.model.ParameterValueProvider) - */ @Override @SuppressWarnings("unchecked") public , P extends PersistentProperty

> T createInstance(E entity, diff --git a/src/main/java/org/springframework/data/mapping/model/PersistableIdentifierAccessor.java b/src/main/java/org/springframework/data/mapping/model/PersistableIdentifierAccessor.java index 7b1e6b361..704c1f38e 100644 --- a/src/main/java/org/springframework/data/mapping/model/PersistableIdentifierAccessor.java +++ b/src/main/java/org/springframework/data/mapping/model/PersistableIdentifierAccessor.java @@ -41,10 +41,6 @@ class PersistableIdentifierAccessor extends TargetAwareIdentifierAccessor { this.target = target; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.IdentifierAccessor#getIdentifier() - */ @Override @Nullable public Object getIdentifier() { diff --git a/src/main/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategy.java b/src/main/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategy.java index 5345e4026..e0e939262 100644 --- a/src/main/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategy.java +++ b/src/main/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategy.java @@ -86,10 +86,6 @@ class PersistentEntityIsNewStrategy implements IsNewStrategy { return new PersistentEntityIsNewStrategy(entity, false); } - /* - * (non-Javadoc) - * @see org.springframework.data.support.IsNewStrategy#isNew(java.lang.Object) - */ @Override public boolean isNew(Object entity) { diff --git a/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java b/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java index a54807be1..42a482ade 100644 --- a/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java +++ b/src/main/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProvider.java @@ -43,10 +43,6 @@ public class PersistentEntityParameterValueProvider

T getParameterValue(Parameter parameter) { diff --git a/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java b/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java index bf9691faf..6b17d5b11 100644 --- a/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java +++ b/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java @@ -98,10 +98,6 @@ public interface PreferredConstructorDiscoverer> PreferredConstructor discover(TypeInformation type, @@ -143,10 +139,6 @@ public interface PreferredConstructorDiscoverer> PreferredConstructor discover(TypeInformation type, diff --git a/src/main/java/org/springframework/data/mapping/model/Property.java b/src/main/java/org/springframework/data/mapping/model/Property.java index 941f2cce0..2e5a6e420 100644 --- a/src/main/java/org/springframework/data/mapping/model/Property.java +++ b/src/main/java/org/springframework/data/mapping/model/Property.java @@ -212,10 +212,6 @@ public class Property { return rawType; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -230,19 +226,11 @@ public class Property { return this.field.isPresent() ? this.field.equals(that.field) : this.descriptor.equals(that.descriptor); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return hashCode.get(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return toString.get(); diff --git a/src/main/java/org/springframework/data/mapping/model/PropertyNameFieldNamingStrategy.java b/src/main/java/org/springframework/data/mapping/model/PropertyNameFieldNamingStrategy.java index 1d3d46f6d..0b4834958 100644 --- a/src/main/java/org/springframework/data/mapping/model/PropertyNameFieldNamingStrategy.java +++ b/src/main/java/org/springframework/data/mapping/model/PropertyNameFieldNamingStrategy.java @@ -27,10 +27,6 @@ public enum PropertyNameFieldNamingStrategy implements FieldNamingStrategy { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.FieldNamingStrategy#getFieldName(org.springframework.data.mapping.PersistentProperty) - */ public String getFieldName(PersistentProperty property) { return property.getName(); } diff --git a/src/main/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessor.java b/src/main/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessor.java index 60b807164..0b75765d4 100644 --- a/src/main/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessor.java +++ b/src/main/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessor.java @@ -59,39 +59,23 @@ class SimplePersistentPropertyPathAccessor implements PersistentPropertyPathA this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#getBean() - */ @Override public T getBean() { return delegate.getBean(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#getProperty(org.springframework.data.mapping.PersistentProperty) - */ @Nullable @Override public Object getProperty(PersistentProperty property) { return delegate.getProperty(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPathAccessor#getProperty(org.springframework.data.mapping.PersistentPropertyPath) - */ @Nullable @Override public Object getProperty(PersistentPropertyPath> path) { return getProperty(path, DEFAULT_GET_OPTIONS); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPathAccessor#getProperty(org.springframework.data.mapping.PersistentPropertyPath, org.springframework.data.mapping.PersistentPropertyPathAccessor.Options) - */ @Nullable @Override public Object getProperty(PersistentPropertyPath> path, GetOptions options) { @@ -118,28 +102,16 @@ class SimplePersistentPropertyPathAccessor implements PersistentPropertyPathA return current; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyAccessor#setProperty(org.springframework.data.mapping.PersistentProperty, java.lang.Object) - */ @Override public void setProperty(PersistentProperty property, @Nullable Object value) { delegate.setProperty(property, value); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PersistentPropertyPathAccessor#setProperty(org.springframework.data.mapping.PersistentPropertyPath, java.lang.Object) - */ @Override public void setProperty(PersistentPropertyPath> path, @Nullable Object value) { setProperty(path, value, AccessOptions.defaultSetOptions()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.ConvertingPropertyAccessor#setProperty(org.springframework.data.mapping.PersistentPropertyPath, java.lang.Object) - */ @SuppressWarnings("unchecked") @Override public void setProperty(PersistentPropertyPath> path, @Nullable Object value, diff --git a/src/main/java/org/springframework/data/mapping/model/SpELContext.java b/src/main/java/org/springframework/data/mapping/model/SpELContext.java index 8440d6338..e2cdfa456 100644 --- a/src/main/java/org/springframework/data/mapping/model/SpELContext.java +++ b/src/main/java/org/springframework/data/mapping/model/SpELContext.java @@ -86,18 +86,10 @@ public class SpELContext { this.factory = factory; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELContext#getParser() - */ public ExpressionParser getParser() { return this.parser; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELContext#getEvaluationContext(java.lang.Object) - */ public EvaluationContext getEvaluationContext(Object source) { var evaluationContext = new StandardEvaluationContext(source); diff --git a/src/main/java/org/springframework/data/mapping/model/SpELExpressionParameterValueProvider.java b/src/main/java/org/springframework/data/mapping/model/SpELExpressionParameterValueProvider.java index f663288f0..31c2aede6 100644 --- a/src/main/java/org/springframework/data/mapping/model/SpELExpressionParameterValueProvider.java +++ b/src/main/java/org/springframework/data/mapping/model/SpELExpressionParameterValueProvider.java @@ -42,10 +42,6 @@ public class SpELExpressionParameterValueProvider

T getParameterValue(Parameter parameter) { diff --git a/src/main/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptor.java b/src/main/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptor.java index 68069591a..c32535804 100644 --- a/src/main/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptor.java +++ b/src/main/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptor.java @@ -66,10 +66,6 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor return false; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { @@ -114,10 +110,6 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor private final @Nullable Method privateLookupIn = ReflectionUtils.findMethod(MethodHandles.class, "privateLookupIn", Class.class, Lookup.class); - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup#lookup(java.lang.reflect.Method) - */ @Override MethodHandle lookup(Method method) throws ReflectiveOperationException { @@ -128,10 +120,6 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor return doLookup(method, getLookup(method.getDeclaringClass(), privateLookupIn)); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup#isAvailable() - */ @Override boolean isAvailable() { return privateLookupIn != null; @@ -157,10 +145,6 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor private final Lazy> constructor = Lazy.of(MethodHandleLookup::getLookupConstructor); - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup#lookup(java.lang.reflect.Method) - */ @Override MethodHandle lookup(Method method) throws ReflectiveOperationException { @@ -173,10 +157,6 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor return constructor.newInstance(method.getDeclaringClass()).unreflectSpecial(method, method.getDeclaringClass()); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup#isAvailable() - */ @Override boolean isAvailable() { return constructor.orElse(null) != null; @@ -190,19 +170,11 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor */ FALLBACK { - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup#lookup(java.lang.reflect.Method) - */ @Override MethodHandle lookup(Method method) throws ReflectiveOperationException { return doLookup(method, MethodHandles.lookup()); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup#isAvailable() - */ @Override boolean isAvailable() { return true; diff --git a/src/main/java/org/springframework/data/projection/DefaultProjectionInformation.java b/src/main/java/org/springframework/data/projection/DefaultProjectionInformation.java index 855618ed3..d693d27fe 100644 --- a/src/main/java/org/springframework/data/projection/DefaultProjectionInformation.java +++ b/src/main/java/org/springframework/data/projection/DefaultProjectionInformation.java @@ -65,19 +65,11 @@ class DefaultProjectionInformation implements ProjectionInformation { this.properties = new PropertyDescriptorSource(type).getDescriptors(); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.ProjectionInformation#getType() - */ @Override public Class getType() { return projectionType; } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.ProjectionInformation#getInputProperties() - */ public List getInputProperties() { return properties.stream()// @@ -86,10 +78,6 @@ class DefaultProjectionInformation implements ProjectionInformation { .collect(Collectors.toList()); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.ProjectionInformation#isDynamic() - */ @Override public boolean isClosed() { return this.properties.equals(getInputProperties()); diff --git a/src/main/java/org/springframework/data/projection/MapAccessingMethodInterceptor.java b/src/main/java/org/springframework/data/projection/MapAccessingMethodInterceptor.java index 126c6a9f0..076ca8e0b 100644 --- a/src/main/java/org/springframework/data/projection/MapAccessingMethodInterceptor.java +++ b/src/main/java/org/springframework/data/projection/MapAccessingMethodInterceptor.java @@ -41,10 +41,6 @@ class MapAccessingMethodInterceptor implements MethodInterceptor { this.map = map; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { diff --git a/src/main/java/org/springframework/data/projection/ProjectingMethodInterceptor.java b/src/main/java/org/springframework/data/projection/ProjectingMethodInterceptor.java index f19071cb4..49d080ee1 100644 --- a/src/main/java/org/springframework/data/projection/ProjectingMethodInterceptor.java +++ b/src/main/java/org/springframework/data/projection/ProjectingMethodInterceptor.java @@ -61,10 +61,6 @@ class ProjectingMethodInterceptor implements MethodInterceptor { this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") @NonNull MethodInvocation invocation) throws Throwable { diff --git a/src/main/java/org/springframework/data/projection/PropertyAccessingMethodInterceptor.java b/src/main/java/org/springframework/data/projection/PropertyAccessingMethodInterceptor.java index 8e3e876cc..0313eff37 100644 --- a/src/main/java/org/springframework/data/projection/PropertyAccessingMethodInterceptor.java +++ b/src/main/java/org/springframework/data/projection/PropertyAccessingMethodInterceptor.java @@ -49,10 +49,6 @@ class PropertyAccessingMethodInterceptor implements MethodInterceptor { this.target = new DirectFieldAccessFallbackBeanWrapper(target); } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { diff --git a/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java b/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java index e43571bf7..d019d9bc2 100644 --- a/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java +++ b/src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java @@ -72,10 +72,6 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware this.factories.add(PropertyAccessingMethodInvokerFactory.INSTANCE); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; @@ -95,10 +91,6 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware this.factories.add(0, factory); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.projection.ProjectionFactory#createProjection(java.lang.Object, java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public T createProjection(Class projectionType, Object source) { @@ -123,10 +115,6 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware return (T) factory.getProxy(classLoader == null ? ClassUtils.getDefaultClassLoader() : classLoader); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.ProjectionFactory#createProjection(java.lang.Class) - */ @Override public T createProjection(Class projectionType) { @@ -135,10 +123,6 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware return createProjection(projectionType, new HashMap()); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.ProjectionFactory#getProjectionInformation(java.lang.Class) - */ @Override public final ProjectionInformation getProjectionInformation(Class projectionType) { @@ -236,10 +220,6 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware this.targetType = targetType; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { @@ -263,20 +243,12 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.projection.MethodInterceptorFactory#createMethodInterceptor(java.lang.Object, java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public MethodInterceptor createMethodInterceptor(Object source, Class targetType) { return new MapAccessingMethodInterceptor((Map) source); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.MethodInterceptorFactory#supports(java.lang.Object, java.lang.Class) - */ @Override public boolean supports(Object source, Class targetType) { return Map.class.isInstance(source); @@ -292,19 +264,11 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.projection.MethodInterceptorFactory#createMethodInterceptor(java.lang.Object, java.lang.Class) - */ @Override public MethodInterceptor createMethodInterceptor(Object source, Class targetType) { return new PropertyAccessingMethodInterceptor(source); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.MethodInterceptorFactory#supports(java.lang.Object, java.lang.Class) - */ @Override public boolean supports(Object source, Class targetType) { return true; diff --git a/src/main/java/org/springframework/data/projection/SpelAwareProxyProjectionFactory.java b/src/main/java/org/springframework/data/projection/SpelAwareProxyProjectionFactory.java index e41db025f..b7fb776a4 100644 --- a/src/main/java/org/springframework/data/projection/SpelAwareProxyProjectionFactory.java +++ b/src/main/java/org/springframework/data/projection/SpelAwareProxyProjectionFactory.java @@ -49,19 +49,11 @@ public class SpelAwareProxyProjectionFactory extends ProxyProjectionFactory impl private @Nullable BeanFactory beanFactory; - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = beanFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.ProxyProjectionFactory#createProjectionInformation(java.lang.Class) - */ @Override protected ProjectionInformation createProjectionInformation(Class projectionType) { return new SpelAwareProjectionInformation(projectionType); @@ -107,10 +99,6 @@ public class SpelAwareProxyProjectionFactory extends ProxyProjectionFactory impl super(projectionType); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.DefaultProjectionInformation#isInputProperty(java.beans.PropertyDescriptor) - */ @Override protected boolean isInputProperty(PropertyDescriptor descriptor) { diff --git a/src/main/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptor.java b/src/main/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptor.java index 37d79dcd1..6f39b14b2 100644 --- a/src/main/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptor.java +++ b/src/main/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptor.java @@ -124,10 +124,6 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor { return Collections.unmodifiableMap(expressions); } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { @@ -168,10 +164,6 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor { return this.args; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -190,10 +182,6 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor { return ObjectUtils.nullSafeEquals(args, that.args); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(target); @@ -201,10 +189,6 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "SpelEvaluatingMethodInterceptor.TargetWrapper(target=" + this.getTarget() + ", args=" diff --git a/src/main/java/org/springframework/data/querydsl/QPageRequest.java b/src/main/java/org/springframework/data/querydsl/QPageRequest.java index 158040fcc..7b5028722 100644 --- a/src/main/java/org/springframework/data/querydsl/QPageRequest.java +++ b/src/main/java/org/springframework/data/querydsl/QPageRequest.java @@ -127,37 +127,21 @@ public class QPageRequest extends AbstractPageRequest { return QPageRequest.of(0, pageSize); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Pageable#getSort() - */ @Override public Sort getSort() { return sort; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.AbstractPageRequest#next() - */ @Override public Pageable next() { return QPageRequest.of(getPageNumber() + 1, getPageSize(), sort); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.AbstractPageRequest#previous() - */ @Override public Pageable previous() { return QPageRequest.of(getPageNumber() - 1, getPageSize(), sort); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.AbstractPageRequest#first() - */ @Override public Pageable first() { return QPageRequest.of(0, getPageSize(), sort); diff --git a/src/main/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapter.java b/src/main/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapter.java index 6e491dee4..bceeb86e9 100644 --- a/src/main/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapter.java +++ b/src/main/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapter.java @@ -57,92 +57,52 @@ public class QuerydslRepositoryInvokerAdapter implements RepositoryInvoker { this.predicate = predicate; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokePagedFindAll(org.springframework.data.domain.Pageable) - */ @Override public Iterable invokeFindAll(Pageable pageable) { return executor.findAll(predicate, pageable); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeSortedFindAll(org.springframework.data.domain.Sort) - */ @Override public Iterable invokeFindAll(Sort sort) { return executor.findAll(predicate, sort); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvocationInformation#hasDeleteMethod() - */ @Override public boolean hasDeleteMethod() { return delegate.hasDeleteMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvocationInformation#hasFindAllMethod() - */ @Override public boolean hasFindAllMethod() { return delegate.hasFindAllMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvocationInformation#hasFindOneMethod() - */ @Override public boolean hasFindOneMethod() { return delegate.hasFindOneMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvocationInformation#hasSaveMethod() - */ @Override public boolean hasSaveMethod() { return delegate.hasSaveMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeDeleteById(java.lang.Object) - */ @Override public void invokeDeleteById(Object id) { delegate.invokeDeleteById(id); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeFindById(java.lang.Object) - */ @Override public Optional invokeFindById(Object id) { return delegate.invokeFindById(id); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeQueryMethod(java.lang.reflect.Method, org.springframework.util.MultiValueMap, org.springframework.data.domain.Pageable, org.springframework.data.domain.Sort) - */ @Override public Optional invokeQueryMethod(Method method, MultiValueMap parameters, Pageable pageable, Sort sort) { return delegate.invokeQueryMethod(method, parameters, pageable, sort); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeSave(java.lang.Object) - */ @Override public T invokeSave(T object) { return delegate.invokeSave(object); diff --git a/src/main/java/org/springframework/data/querydsl/binding/PropertyPathInformation.java b/src/main/java/org/springframework/data/querydsl/binding/PropertyPathInformation.java index bde4bf397..c97237664 100644 --- a/src/main/java/org/springframework/data/querydsl/binding/PropertyPathInformation.java +++ b/src/main/java/org/springframework/data/querydsl/binding/PropertyPathInformation.java @@ -64,65 +64,37 @@ record PropertyPathInformation(PropertyPath path) implements PathInformation { return new PropertyPathInformation(path); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getRootParentType() - */ @Override public Class getRootParentType() { return path.getOwningType().getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafType() - */ @Override public Class getLeafType() { return path.getLeafProperty().getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafParentType() - */ @Override public Class getLeafParentType() { return path.getLeafProperty().getOwningType().getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafProperty() - */ @Override public String getLeafProperty() { return path.getLeafProperty().getSegment(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafPropertyDescriptor() - */ @Nullable @Override public PropertyDescriptor getLeafPropertyDescriptor() { return BeanUtils.getPropertyDescriptor(getLeafParentType(), getLeafProperty()); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#toDotPath() - */ @Override public String toDotPath() { return path.toDotPath(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#reifyPath(org.springframework.data.querydsl.EntityPathResolver) - */ @Override public Path reifyPath(EntityPathResolver resolver) { return reifyPath(resolver, path, null); @@ -147,10 +119,6 @@ record PropertyPathInformation(PropertyPath path) implements PathInformation { return (Path) value; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -166,10 +134,6 @@ record PropertyPathInformation(PropertyPath path) implements PathInformation { && ObjectUtils.nullSafeEquals(toDotPath(), that.toDotPath()); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(getRootParentType()); @@ -177,10 +141,6 @@ record PropertyPathInformation(PropertyPath path) implements PathInformation { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "PropertyPathInformation(path=" + this.path + ")"; diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java index 7dd79290f..93c0f3f54 100644 --- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java @@ -476,10 +476,6 @@ public class QuerydslBindings { registerBinding(PathAndBinding.withPath(path)); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.QuerydslBindings.PathBinder#registerBinding(org.springframework.data.querydsl.binding.QuerydslBindings.PathAndBinding) - */ @Override protected void registerBinding(PathAndBinding binding) { @@ -575,10 +571,6 @@ public class QuerydslBindings { return this.binding; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -593,10 +585,6 @@ public class QuerydslBindings { return ObjectUtils.nullSafeEquals(binding, that.binding); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(path); @@ -604,10 +592,6 @@ public class QuerydslBindings { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "QuerydslBindings.PathAndBinding(path=" + this.getPath() + ", binding=" + this.getBinding() + ")"; diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java index 5ff2c4105..a65785ac0 100644 --- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java @@ -68,10 +68,6 @@ public class QuerydslBindingsFactory implements ApplicationContextAware { this.defaultCustomizer = NoOpCustomizer.INSTANCE; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java index cb4fec491..ec28b7b94 100644 --- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java @@ -42,10 +42,6 @@ import com.querydsl.core.types.dsl.SimpleExpression; */ class QuerydslDefaultBinding implements MultiValueBinding, Object> { - /* - * (non-Javadoc) - * @see org.springframework.data.web.querydsl.QueryDslPredicateBuilder#buildPredicate(org.springframework.data.mapping.PropertyPath, java.lang.Object) - */ @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Optional bind(Path path, Collection value) { diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslPathInformation.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPathInformation.java index 4b91ad9e0..d1d36199a 100644 --- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslPathInformation.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPathInformation.java @@ -44,28 +44,16 @@ class QuerydslPathInformation implements PathInformation { return new QuerydslPathInformation(path); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getRootParentType() - */ @Override public Class getRootParentType() { return path.getRoot().getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafType() - */ @Override public Class getLeafType() { return path.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafParentType() - */ @Override public Class getLeafParentType() { @@ -78,46 +66,26 @@ class QuerydslPathInformation implements PathInformation { return parent.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafProperty() - */ @Override public String getLeafProperty() { return path.getMetadata().getElement().toString(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#getLeafPropertyDescriptor() - */ @Nullable @Override public PropertyDescriptor getLeafPropertyDescriptor() { return BeanUtils.getPropertyDescriptor(getLeafParentType(), getLeafProperty()); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#toDotPath() - */ @Override public String toDotPath() { return QuerydslUtils.toDotPath(path); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.PathInformation#reifyPath(org.springframework.data.querydsl.EntityPathResolver) - */ public Path reifyPath(EntityPathResolver resolver) { return path; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -133,10 +101,6 @@ class QuerydslPathInformation implements PathInformation { && ObjectUtils.nullSafeEquals(toDotPath(), that.toDotPath()); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(getRootParentType()); @@ -144,10 +108,6 @@ class QuerydslPathInformation implements PathInformation { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "QuerydslPathInformation(path=" + this.path + ")"; diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java index 1ca901e31..481308b45 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java @@ -153,10 +153,6 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl return StringUtils.collectionToDelimitedString(qualifierNames, ":") + ":" + repositoryType.getName(); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getTypes() - */ @SuppressWarnings("rawtypes") public Set getTypes() { @@ -202,10 +198,6 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl create(beanManager.createCreationalContext(this)); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.context.spi.Contextual#create(jakarta.enterprise.context.spi.CreationalContext) - */ public final T create(@SuppressWarnings("null") CreationalContext creationalContext) { var repoInstance = this.repoInstance; @@ -222,10 +214,6 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl return repoInstance; } - /* - * (non-Javadoc) - * @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext) - */ public void destroy(@SuppressWarnings("null") T instance, @SuppressWarnings("null") CreationalContext creationalContext) { @@ -237,26 +225,14 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl creationalContext.release(); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getQualifiers() - */ public Set getQualifiers() { return qualifiers; } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getName() - */ public String getName() { return repositoryType.getName(); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getStereotypes() - */ public Set> getStereotypes() { return Arrays.stream(repositoryType.getAnnotations())// @@ -265,50 +241,26 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl .collect(Collectors.toSet()); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getBeanClass() - */ public Class getBeanClass() { return repositoryType; } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#isAlternative() - */ public boolean isAlternative() { return isAnnotatedWith(repositoryType, Alternative.class); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#isNullable() - */ public boolean isNullable() { return false; } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints() - */ public Set getInjectionPoints() { return Collections.emptySet(); } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.Bean#getScope() - */ public Class getScope() { return ApplicationScoped.class; } - /* - * (non-Javadoc) - * @see jakarta.enterprise.inject.spi.PassivationCapable#getId() - */ public String getId() { return passivationId; } @@ -484,10 +436,6 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl return qualifiers.toArray(new Annotation[0]); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("CdiRepositoryBean: type='%s', qualifiers=%s", repositoryType.getName(), diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java index 9d8b5ea92..f1dcbfce9 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java @@ -170,28 +170,16 @@ public class CdiRepositoryContext { this.metadataReaderFactory = metadataReaderFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#getImplementationPostfix() - */ @Override public String getImplementationPostfix() { return configuration.getRepositoryImplementationPostfix(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#getBasePackages() - */ @Override public Streamable getBasePackages() { return Streamable.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#getExcludeFilters() - */ @Override public Streamable getExcludeFilters() { return Streamable.empty(); diff --git a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java index 171912c91..72df41ce1 100644 --- a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java @@ -127,10 +127,6 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura this.hasExplicitFilters = hasExplicitFilters(attributes); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getBasePackages() - */ public Streamable getBasePackages() { var value = attributes.getStringArray("value"); @@ -155,70 +151,38 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura return Streamable.of(packages); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getQueryLookupStrategyKey() - */ public Optional getQueryLookupStrategyKey() { return Optional.ofNullable(attributes.get(QUERY_LOOKUP_STRATEGY)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getNamedQueryLocation() - */ public Optional getNamedQueryLocation() { return getNullDefaultedAttribute(NAMED_QUERIES_LOCATION); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryImplementationPostfix() - */ public Optional getRepositoryImplementationPostfix() { return getNullDefaultedAttribute(REPOSITORY_IMPLEMENTATION_POSTFIX); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getSource() - */ @NonNull public Object getSource() { return configMetadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#getIncludeFilters() - */ @Override protected Iterable getIncludeFilters() { return parseFilters("includeFilters"); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#getExcludeFilters() - */ @Override public Streamable getExcludeFilters() { return parseFilters("excludeFilters"); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryFactoryBeanClassName() - */ @Override public Optional getRepositoryFactoryBeanClassName() { return Optional.of(attributes.getClass(REPOSITORY_FACTORY_BEAN_CLASS).getName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryBaseClassName() - */ @Override public Optional getRepositoryBaseClassName() { @@ -249,28 +213,16 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura return enableAnnotationMetadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#shouldConsiderNestedRepositories() - */ @Override public boolean shouldConsiderNestedRepositories() { return attributes.containsKey(CONSIDER_NESTED_REPOSITORIES) && attributes.getBoolean(CONSIDER_NESTED_REPOSITORIES); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getAttribute(java.lang.String) - */ @Override public Optional getAttribute(String name) { return getAttribute(name, String.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getAttribute(java.lang.String, java.lang.Class) - */ @Override public Optional getAttribute(String name, Class type) { @@ -295,19 +247,11 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura return Optional.ofNullable(type.cast(result)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#usesExplicitFilters() - */ @Override public boolean usesExplicitFilters() { return hasExplicitFilters; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getBootstrapMode() - */ @Override public BootstrapMode getBootstrapMode() { @@ -318,10 +262,6 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura } } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getResourceDescription() - */ @Override public String getResourceDescription() { diff --git a/src/main/java/org/springframework/data/repository/config/DefaultImplementationLookupConfiguration.java b/src/main/java/org/springframework/data/repository/config/DefaultImplementationLookupConfiguration.java index 75b1627bb..4be0da5b3 100644 --- a/src/main/java/org/springframework/data/repository/config/DefaultImplementationLookupConfiguration.java +++ b/src/main/java/org/springframework/data/repository/config/DefaultImplementationLookupConfiguration.java @@ -60,64 +60,36 @@ class DefaultImplementationLookupConfiguration implements ImplementationLookupCo .decapitalize(ClassUtils.getShortName(interfaceName).concat(config.getImplementationPostfix())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationLookupConfiguration#getImplementationBeanName() - */ @Override public String getImplementationBeanName() { return beanName; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationDetectionConfiguration#getImplementationPostfix() - */ @Override public String getImplementationPostfix() { return config.getImplementationPostfix(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationDetectionConfiguration#getExcludeFilters() - */ @Override public Streamable getExcludeFilters() { return config.getExcludeFilters().and(new AnnotationTypeFilter(NoRepositoryBean.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationDetectionConfiguration#getMetadataReaderFactory() - */ @Override public MetadataReaderFactory getMetadataReaderFactory() { return config.getMetadataReaderFactory(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationDetectionConfiguration#getBasePackages() - */ @Override public Streamable getBasePackages() { return Streamable.of(ClassUtils.getPackageName(interfaceName)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationLookupConfiguration#getImplementationClassName() - */ @Override public String getImplementationClassName() { return getLocalName(interfaceName).concat(getImplementationPostfix()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationLookupConfiguration#hasMatchingBeanName(org.springframework.beans.factory.config.BeanDefinition) - */ @Override public boolean hasMatchingBeanName(BeanDefinition definition) { @@ -126,10 +98,6 @@ class DefaultImplementationLookupConfiguration implements ImplementationLookupCo return beanName != null && beanName.equals(config.generateBeanName(definition)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ImplementationLookupConfiguration#matches(org.springframework.beans.factory.config.BeanDefinition, org.springframework.core.type.classreading.MetadataReaderFactory) - */ @Override public boolean matches(BeanDefinition definition) { diff --git a/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java b/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java index d83f7e8b0..1d107df0d 100644 --- a/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java +++ b/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java @@ -53,114 +53,62 @@ public class DefaultRepositoryConfiguration new IllegalStateException("Can't create bean identifier without a repository base class defined!")))); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getQueryLookupStrategyKey() - */ public Object getQueryLookupStrategyKey() { return configurationSource.getQueryLookupStrategyKey().orElse(DEFAULT_QUERY_LOOKUP_STRATEGY); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getBasePackages() - */ public Streamable getBasePackages() { return configurationSource.getBasePackages(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getImplementationBasePackages() - */ @Override public Streamable getImplementationBasePackages() { return Streamable.of(ClassUtils.getPackageName(getRepositoryInterface())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getRepositoryInterface() - */ public String getRepositoryInterface() { return ConfigurationUtils.getRequiredBeanClassName(definition); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getConfigSource() - */ public RepositoryConfigurationSource getConfigSource() { return configurationSource; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getNamedQueryLocation() - */ public Optional getNamedQueriesLocation() { return configurationSource.getNamedQueryLocation(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getImplementationClassName() - */ public String getImplementationClassName() { return ClassUtils.getShortName(getRepositoryInterface()).concat( configurationSource.getRepositoryImplementationPostfix().orElse(DEFAULT_REPOSITORY_IMPLEMENTATION_POSTFIX)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getImplementationBeanName() - */ public String getImplementationBeanName() { return configurationSource.generateBeanName(definition) + configurationSource.getRepositoryImplementationPostfix().orElse("Impl"); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getSource() - */ @Nullable @Override public Object getSource() { return configurationSource.getSource(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getConfigurationSource() - */ @Override public T getConfigurationSource() { return configurationSource; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getRepositoryBaseClassName() - */ @Override public Optional getRepositoryBaseClassName() { return configurationSource.getRepositoryBaseClassName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#getRepositoryFactoryBeanClassName() - */ @Override public String getRepositoryFactoryBeanClassName() { @@ -168,37 +116,21 @@ public class DefaultRepositoryConfiguration getExcludeFilters() { return configurationSource.getExcludeFilters(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfiguration#toImplementationDetectionConfiguration(org.springframework.core.type.classreading.MetadataReaderFactory) - */ @Override public ImplementationDetectionConfiguration toImplementationDetectionConfiguration(MetadataReaderFactory factory) { @@ -207,10 +139,6 @@ public class DefaultRepositoryConfiguration getBasePackages() { return config.getImplementationBasePackages(); diff --git a/src/main/java/org/springframework/data/repository/config/NamedQueriesBeanDefinitionParser.java b/src/main/java/org/springframework/data/repository/config/NamedQueriesBeanDefinitionParser.java index a22acb112..bcc013ddf 100644 --- a/src/main/java/org/springframework/data/repository/config/NamedQueriesBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/repository/config/NamedQueriesBeanDefinitionParser.java @@ -51,10 +51,6 @@ public class NamedQueriesBeanDefinitionParser implements BeanDefinitionParser { this.defaultLocation = defaultLocation; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) - */ @NonNull public BeanDefinition parse(Element element, ParserContext parserContext) { diff --git a/src/main/java/org/springframework/data/repository/config/PersistentEntitiesFactoryBean.java b/src/main/java/org/springframework/data/repository/config/PersistentEntitiesFactoryBean.java index b04e60684..ba919e81b 100644 --- a/src/main/java/org/springframework/data/repository/config/PersistentEntitiesFactoryBean.java +++ b/src/main/java/org/springframework/data/repository/config/PersistentEntitiesFactoryBean.java @@ -38,19 +38,11 @@ public class PersistentEntitiesFactoryBean implements FactoryBean getObjectType() { return PersistentEntities.class; diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java b/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java index 4f3b55b31..a4c5440fa 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java @@ -50,10 +50,6 @@ public class RepositoryBeanDefinitionParser implements BeanDefinitionParser { this.extension = extension; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) - */ @Nullable public BeanDefinition parse(Element element, ParserContext parser) { diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupport.java index 722f7dfae..f072b8043 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupport.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupport.java @@ -41,19 +41,11 @@ public abstract class RepositoryBeanDefinitionRegistrarSupport private @SuppressWarnings("null") @NonNull ResourceLoader resourceLoader; private @SuppressWarnings("null") @NonNull Environment environment; - /* - * (non-Javadoc) - * @see org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader) - */ @Override public void setResourceLoader(ResourceLoader resourceLoader) { this.resourceLoader = resourceLoader; } - /* - * (non-Javadoc) - * @see org.springframework.context.EnvironmentAware#setEnvironment(org.springframework.core.env.Environment) - */ @Override public void setEnvironment(Environment environment) { this.environment = environment; @@ -77,10 +69,6 @@ public abstract class RepositoryBeanDefinitionRegistrarSupport registerBeanDefinitions(metadata, registry, ConfigurationClassPostProcessor.IMPORT_BEAN_NAME_GENERATOR); } - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ImportBeanDefinitionRegistrar#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry, org.springframework.beans.factory.support.BeanNameGenerator) - */ @Override public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry, BeanNameGenerator generator) { diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java b/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java index 9f6ba3f28..80aa16856 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java @@ -100,10 +100,6 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro super.addIncludeFilter(new AllTypeFilter(filterPlusAnnotation)); } - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider#isCandidateComponent(org.springframework.beans.factory.annotation.AnnotatedBeanDefinition) - */ @Override protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) { @@ -131,10 +127,6 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro return candidates; } - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider#getRegistry() - */ @NonNull @Override protected BeanDefinitionRegistry getRegistry() { @@ -175,10 +167,6 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro super(targetType); } - /* - * (non-Javadoc) - * @see org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory) - */ @Override public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { @@ -207,10 +195,6 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro this.delegates = delegates; } - /* - * (non-Javadoc) - * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory) - */ public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java index 039c8dc7e..6993a5625 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java @@ -308,10 +308,6 @@ public class RepositoryConfigurationDelegate { return new LazyRepositoryInjectionPointResolver(map); } - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver#isLazy(org.springframework.beans.factory.config.DependencyDescriptor) - */ @Override protected boolean isLazy(DependencyDescriptor descriptor) { diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java index 6a6ab8be1..cb34975a8 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java @@ -59,28 +59,16 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit private boolean noMultiStoreSupport = false; - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getModuleName() - */ @Override public String getModuleName() { return StringUtils.capitalize(getModulePrefix()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryConfigurations(org.springframework.data.repository.config.RepositoryConfigurationSource, org.springframework.core.io.ResourceLoader) - */ public Collection> getRepositoryConfigurations( T configSource, ResourceLoader loader) { return getRepositoryConfigurations(configSource, loader, false); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryConfigurations(org.springframework.data.repository.config.RepositoryConfigurationSource, org.springframework.core.io.ResourceLoader, boolean) - */ public Collection> getRepositoryConfigurations( T configSource, ResourceLoader loader, boolean strictMatchesOnly) { @@ -113,18 +101,10 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit return result; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getDefaultNamedQueryLocation() - */ public String getDefaultNamedQueryLocation() { return String.format("classpath*:META-INF/%s-named-queries.properties", getModulePrefix()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#registerBeansForRoot(org.springframework.beans.factory.support.BeanDefinitionRegistry, org.springframework.data.repository.config.RepositoryConfigurationSource) - */ public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConfigurationSource configurationSource) {} @@ -135,22 +115,10 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit */ protected abstract String getModulePrefix(); - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.RepositoryConfigurationSource) - */ public void postProcess(BeanDefinitionBuilder builder, RepositoryConfigurationSource source) {} - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource) - */ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {} - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource) - */ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) {} /** diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java index efb963cbc..281ee199e 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java @@ -62,10 +62,6 @@ public abstract class RepositoryConfigurationSourceSupport implements Repository this.registry = registry; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getCandidates(org.springframework.core.io.ResourceLoader) - */ @Override public Streamable getCandidates(ResourceLoader loader) { @@ -91,10 +87,6 @@ public abstract class RepositoryConfigurationSourceSupport implements Repository return Streamable.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getBeanNameGenerator() - */ @Override public String generateBeanName(BeanDefinition beanDefinition) { return beanNameGenerator.generateBeanName(beanDefinition); @@ -120,10 +112,6 @@ public abstract class RepositoryConfigurationSourceSupport implements Repository return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#toImplementationDetectionConfiguration() - */ @Override public ImplementationDetectionConfiguration toImplementationDetectionConfiguration(MetadataReaderFactory factory) { return new SpringImplementationDetectionConfiguration(this, factory); @@ -140,38 +128,22 @@ public abstract class RepositoryConfigurationSourceSupport implements Repository this.metadataReaderFactory = metadataReaderFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#getImplementationPostfix() - */ @Override public String getImplementationPostfix() { return source.getRepositoryImplementationPostfix() .orElse(DefaultRepositoryConfiguration.DEFAULT_REPOSITORY_IMPLEMENTATION_POSTFIX); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#getBasePackages() - */ @Override public Streamable getBasePackages() { return source.getBasePackages(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#getExcludeFilters() - */ @Override public Streamable getExcludeFilters() { return source.getExcludeFilters(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector.ImplementationDetectionConfiguration#generateBeanName(org.springframework.beans.factory.config.BeanDefinition) - */ @Override public String generateBeanName(BeanDefinition definition) { return source.generateBeanName(definition); diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java b/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java index 655f6193c..f7c358c70 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryFragmentConfiguration.java @@ -104,10 +104,6 @@ public final class RepositoryFragmentConfiguration { return this.beanDefinition; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -130,10 +126,6 @@ public final class RepositoryFragmentConfiguration { return ObjectUtils.nullSafeEquals(beanDefinition, that.beanDefinition); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(interfaceName); @@ -142,10 +134,6 @@ public final class RepositoryFragmentConfiguration { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "RepositoryFragmentConfiguration(interfaceName=" + this.getInterfaceName() + ", className=" diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryNameSpaceHandler.java b/src/main/java/org/springframework/data/repository/config/RepositoryNameSpaceHandler.java index 130b60e1f..a0d10f2d7 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryNameSpaceHandler.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryNameSpaceHandler.java @@ -30,10 +30,6 @@ public class RepositoryNameSpaceHandler extends NamespaceHandlerSupport { private static final BeanDefinitionParser PARSER = new ResourceReaderRepositoryPopulatorBeanDefinitionParser(); - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.NamespaceHandler#init() - */ public void init() { registerBeanDefinitionParser("unmarshaller-populator", PARSER); diff --git a/src/main/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParser.java b/src/main/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParser.java index 8cb7f443b..0ff996ebd 100644 --- a/src/main/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParser.java @@ -34,10 +34,6 @@ import org.w3c.dom.Element; */ public class ResourceReaderRepositoryPopulatorBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClassName(org.w3c.dom.Element) - */ @NonNull @Override protected String getBeanClassName(Element element) { @@ -53,10 +49,6 @@ public class ResourceReaderRepositoryPopulatorBeanDefinitionParser extends Abstr throw new IllegalStateException("Unsupported populator type " + name + "!"); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder) - */ @Override protected void doParse(Element element, BeanDefinitionBuilder builder) { @@ -101,10 +93,6 @@ public class ResourceReaderRepositoryPopulatorBeanDefinitionParser extends Abstr } } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateIdAsFallback() - */ @Override protected boolean shouldGenerateIdAsFallback() { return true; diff --git a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java index b76236519..33df8e863 100644 --- a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java @@ -85,19 +85,11 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou this.excludeFilters = parser.parseTypeFilters(element, Type.EXCLUDE); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getSource() - */ @Nullable public Object getSource() { return context.extractSource(element); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getBasePackages() - */ public Streamable getBasePackages() { var attribute = element.getAttribute(BASE_PACKAGE); @@ -105,18 +97,10 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou return Streamable.of(StringUtils.delimitedListToStringArray(attribute, ",", " ")); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getQueryLookupStrategyKey() - */ public Optional getQueryLookupStrategyKey() { return getNullDefaultedAttribute(element, QUERY_LOOKUP_STRATEGY).map(Key::create); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getNamedQueryLocation() - */ public Optional getNamedQueryLocation() { return getNullDefaultedAttribute(element, NAMED_QUERIES_LOCATION); } @@ -130,52 +114,29 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou return element; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#getExcludeFilters() - */ @Override public Streamable getExcludeFilters() { return Streamable.of(excludeFilters); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#getIncludeFilters() - */ @Override protected Iterable getIncludeFilters() { return includeFilters; } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryImplementationPostfix() - */ public Optional getRepositoryImplementationPostfix() { return getNullDefaultedAttribute(element, REPOSITORY_IMPL_POSTFIX); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryFactoryBeanName() - */ public Optional getRepositoryFactoryBeanName() { return getNullDefaultedAttribute(element, REPOSITORY_FACTORY_BEAN_CLASS_NAME); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryBaseClassName() - */ @Override public Optional getRepositoryBaseClassName() { return getNullDefaultedAttribute(element, REPOSITORY_BASE_CLASS_NAME); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getRepositoryFactoryBeanClassName() - */ @Override public Optional getRepositoryFactoryBeanClassName() { return getNullDefaultedAttribute(element, REPOSITORY_FACTORY_BEAN_CLASS_NAME); @@ -187,19 +148,11 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou return StringUtils.hasText(attribute) ? Optional.of(attribute) : Optional.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#isConsideringNestedRepositoriesEnabled() - */ @Override public boolean shouldConsiderNestedRepositories() { return getNullDefaultedAttribute(element, CONSIDER_NESTED_REPOSITORIES).map(Boolean::parseBoolean).orElse(false); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getAttribute(java.lang.String) - */ @Override public Optional getAttribute(String name) { @@ -209,10 +162,6 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou return StringUtils.hasText(attribute) ? Optional.of(attribute) : Optional.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getAttribute(java.lang.String, java.lang.Class) - */ @SuppressWarnings("unchecked") @Override public Optional getAttribute(String name, Class type) { @@ -222,19 +171,11 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou return (Optional) getAttribute(name); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#usesExplicitFilters() - */ @Override public boolean usesExplicitFilters() { return !(this.includeFilters.isEmpty() && this.excludeFilters.isEmpty()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getBootstrapMode() - */ @Override public BootstrapMode getBootstrapMode() { @@ -245,10 +186,6 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou : BootstrapMode.DEFAULT; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSource#getResourceDescription() - */ @Override @NonNull public String getResourceDescription() { diff --git a/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java b/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java index 68df66e13..b96d20d9d 100644 --- a/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java @@ -37,10 +37,6 @@ public abstract class AbstractEntityInformation implements EntityInformat this.domainClass = domainClass; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#isNew(java.lang.Object) - */ public boolean isNew(T entity) { var id = getId(entity); @@ -57,10 +53,6 @@ public abstract class AbstractEntityInformation implements EntityInformat throw new IllegalArgumentException(String.format("Unsupported primitive id type %s!", idType)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityMetadata#getJavaType() - */ public Class getJavaType() { return this.domainClass; } diff --git a/src/main/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadata.java b/src/main/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadata.java index 367bda4f1..442fa8c18 100644 --- a/src/main/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadata.java +++ b/src/main/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadata.java @@ -78,10 +78,6 @@ public abstract class AbstractRepositoryMetadata implements RepositoryMetadata { : new AnnotationRepositoryMetadata(repositoryInterface); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method) - */ @Override public TypeInformation getReturnType(Method method) { @@ -100,10 +96,6 @@ public abstract class AbstractRepositoryMetadata implements RepositoryMetadata { return returnType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method) - */ public Class getReturnedDomainClass(Method method) { var returnType = getReturnType(method); @@ -112,27 +104,15 @@ public abstract class AbstractRepositoryMetadata implements RepositoryMetadata { .getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface() - */ public Class getRepositoryInterface() { return this.repositoryInterface; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods() - */ @Override public CrudMethods getCrudMethods() { return this.crudMethods.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository() - */ @Override public boolean isPagingRepository() { @@ -141,19 +121,11 @@ public abstract class AbstractRepositoryMetadata implements RepositoryMetadata { .orElse(false); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes() - */ @Override public Set> getAlternativeDomainTypes() { return Collections.emptySet(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository() - */ @Override public boolean isReactiveRepository() { return ReactiveWrappers.usesReactiveType(repositoryInterface); diff --git a/src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java b/src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java index 0a450f26d..f21637188 100644 --- a/src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java +++ b/src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java @@ -53,19 +53,11 @@ public class AnnotationRepositoryMetadata extends AbstractRepositoryMetadata { this.domainType = resolveDomainType(repositoryInterface); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getIdType() - */ @Override public Class getIdType() { return this.idType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getDomainType() - */ @Override public Class getDomainType() { return this.domainType; diff --git a/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java b/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java index 85c26f233..f6227db3f 100644 --- a/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java +++ b/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java @@ -181,73 +181,41 @@ public class DefaultCrudMethods implements CrudMethods { .findFirst(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#getSaveMethod() - */ @Override public Optional getSaveMethod() { return saveMethod; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#hasSaveMethod() - */ @Override public boolean hasSaveMethod() { return saveMethod.isPresent(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#getFindAllMethod() - */ @Override public Optional getFindAllMethod() { return findAllMethod; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#hasFindAllMethod() - */ @Override public boolean hasFindAllMethod() { return findAllMethod.isPresent(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#getFindOneMethod() - */ @Override public Optional getFindOneMethod() { return findOneMethod; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#hasFindOneMethod() - */ @Override public boolean hasFindOneMethod() { return findOneMethod.isPresent(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#hasDelete() - */ @Override public boolean hasDelete() { return this.deleteMethod.isPresent(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.CrudMethods#getDeleteMethod() - */ @Override public Optional getDeleteMethod() { return this.deleteMethod; diff --git a/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java b/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java index 38f78b016..cd2171908 100644 --- a/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java @@ -75,37 +75,21 @@ class DefaultRepositoryInformation implements RepositoryInformation { .withMethodLookup(composition.getMethodLookup()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryMetadata#getDomainClass() - */ @Override public Class getDomainType() { return metadata.getDomainType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryMetadata#getIdClass() - */ @Override public Class getIdType() { return metadata.getIdType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInformation#getRepositoryBaseClass() - */ @Override public Class getRepositoryBaseClass() { return this.repositoryBaseClass; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInformation#getTargetClassMethod(java.lang.reflect.Method) - */ @Override public Method getTargetClassMethod(Method method) { @@ -132,10 +116,6 @@ class DefaultRepositoryInformation implements RepositoryInformation { return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInformation#getQueryMethods() - */ @Override public Streamable getQueryMethods() { @@ -175,28 +155,16 @@ class DefaultRepositoryInformation implements RepositoryInformation { return AnnotationUtils.findAnnotation(method, QueryAnnotation.class) != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInformation#isCustomMethod(java.lang.reflect.Method) - */ @Override public boolean isCustomMethod(Method method) { return composition.getMethod(method) != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryInformation#isQueryMethod(java.lang.reflect.Method) - */ @Override public boolean isQueryMethod(Method method) { return getQueryMethods().stream().anyMatch(it -> it.equals(method)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryInformation#isBaseClassMethod(java.lang.reflect.Method) - */ @Override public boolean isBaseClassMethod(Method method) { @@ -204,10 +172,6 @@ class DefaultRepositoryInformation implements RepositoryInformation { return baseComposition.getMethod(method) != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInformation#hasCustomMethod() - */ @Override public boolean hasCustomMethod() { @@ -227,64 +191,36 @@ class DefaultRepositoryInformation implements RepositoryInformation { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getRepositoryInterface() - */ @Override public Class getRepositoryInterface() { return metadata.getRepositoryInterface(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnedDomainClass(java.lang.reflect.Method) - */ @Override public Class getReturnedDomainClass(Method method) { return metadata.getReturnedDomainClass(method); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getReturnType(java.lang.reflect.Method) - */ @Override public TypeInformation getReturnType(Method method) { return metadata.getReturnType(method); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getCrudMethods() - */ @Override public CrudMethods getCrudMethods() { return metadata.getCrudMethods(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#isPagingRepository() - */ @Override public boolean isPagingRepository() { return metadata.isPagingRepository(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#getAlternativeDomainTypes() - */ @Override public Set> getAlternativeDomainTypes() { return metadata.getAlternativeDomainTypes(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.RepositoryMetadata#isReactiveRepository() - */ @Override public boolean isReactiveRepository() { return metadata.isReactiveRepository(); diff --git a/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java b/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java index 960f16be7..aa997fabb 100644 --- a/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/DelegatingEntityInformation.java @@ -32,38 +32,22 @@ public class DelegatingEntityInformation implements EntityInformation getJavaType() { return delegate.getJavaType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#isNew(java.lang.Object) - */ @Override public boolean isNew(T entity) { return delegate.isNew(entity); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#getId(java.lang.Object) - */ @Nullable @Override public ID getId(T entity) { return delegate.getId(entity); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#getIdType() - */ @Override public Class getIdType() { return delegate.getIdType(); diff --git a/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java b/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java index cdda0f916..d319de842 100644 --- a/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java +++ b/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java @@ -58,10 +58,6 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr this.publisher = publisher; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryProxyPostProcessor#postProcess(org.springframework.aop.framework.ProxyFactory, org.springframework.data.repository.core.RepositoryInformation) - */ @Override public void postProcess(ProxyFactory factory, RepositoryInformation repositoryInformation) { @@ -97,10 +93,6 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr return new EventPublishingMethodInterceptor(eventMethod, publisher); } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Override @Nullable public Object invoke(MethodInvocation invocation) throws Throwable { diff --git a/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java b/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java index 76204a269..4312c0aa5 100644 --- a/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java +++ b/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java @@ -63,10 +63,6 @@ public class MethodInvocationValidator implements MethodInterceptor { || NullableUtils.isNonNull(repositoryInterface, ElementType.PARAMETER); } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { @@ -172,10 +168,6 @@ public class MethodInvocationValidator implements MethodInterceptor { return this.methodParameters; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -198,10 +190,6 @@ public class MethodInvocationValidator implements MethodInterceptor { return ObjectUtils.nullSafeEquals(methodParameters, that.methodParameters); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = (nullableReturn ? 1 : 0); @@ -210,10 +198,6 @@ public class MethodInvocationValidator implements MethodInterceptor { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "MethodInvocationValidator.Nullability(nullableReturn=" + this.isNullableReturn() + ", nullableParameters=" diff --git a/src/main/java/org/springframework/data/repository/core/support/MethodLookup.java b/src/main/java/org/springframework/data/repository/core/support/MethodLookup.java index 21c283eab..206e750a0 100644 --- a/src/main/java/org/springframework/data/repository/core/support/MethodLookup.java +++ b/src/main/java/org/springframework/data/repository/core/support/MethodLookup.java @@ -108,10 +108,6 @@ public interface MethodLookup { return this.method; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -126,19 +122,11 @@ public interface MethodLookup { return ObjectUtils.nullSafeEquals(method, that.method); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(method); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "MethodLookup.InvokedMethod(method=" + this.getMethod() + ")"; diff --git a/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java b/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java index 198329a7e..d42b076f9 100644 --- a/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java +++ b/src/main/java/org/springframework/data/repository/core/support/MethodLookups.java @@ -124,10 +124,6 @@ interface MethodLookups { this.repositoryInterface = repositoryMetadata.getRepositoryInterface(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.MethodLookup#getLookups() - */ @Override public List getLookups() { @@ -233,10 +229,6 @@ interface MethodLookups { this.repositoryMetadata = repositoryMetadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.MethodLookups.RepositoryAwareMethodLookup#getLookups() - */ @Override public List getLookups() { @@ -438,10 +430,6 @@ interface MethodLookups { return this.base; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -460,10 +448,6 @@ interface MethodLookups { return ObjectUtils.nullSafeEquals(base, that.base); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(declared); @@ -471,10 +455,6 @@ interface MethodLookups { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "MethodLookups.ReactiveTypeInteropMethodLookup.ParameterOverrideCriteria(declared=" + this.getDeclared() diff --git a/src/main/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessor.java b/src/main/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessor.java index b27854422..fdca7952d 100644 --- a/src/main/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessor.java +++ b/src/main/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessor.java @@ -46,10 +46,6 @@ public class PersistenceExceptionTranslationRepositoryProxyPostProcessor impleme this.interceptor.afterPropertiesSet(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryProxyPostProcessor#postProcess(org.springframework.aop.framework.ProxyFactory, org.springframework.data.repository.core.RepositoryInformation) - */ public void postProcess(ProxyFactory factory, RepositoryInformation repositoryInformation) { factory.addAdvice(interceptor); } diff --git a/src/main/java/org/springframework/data/repository/core/support/PersistentEntityInformation.java b/src/main/java/org/springframework/data/repository/core/support/PersistentEntityInformation.java index 255623525..6b93febcd 100644 --- a/src/main/java/org/springframework/data/repository/core/support/PersistentEntityInformation.java +++ b/src/main/java/org/springframework/data/repository/core/support/PersistentEntityInformation.java @@ -35,19 +35,11 @@ public class PersistentEntityInformation implements EntityInformation implements EntityInformation getJavaType() { return persistentEntity.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityInformation#getIdType() - */ @Override @SuppressWarnings("unchecked") public Class getIdType() { diff --git a/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java b/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java index d93e6ba29..16e755e70 100644 --- a/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java +++ b/src/main/java/org/springframework/data/repository/core/support/PropertiesBasedNamedQueries.java @@ -37,10 +37,6 @@ public class PropertiesBasedNamedQueries implements NamedQueries { this.properties = properties; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.NamedQueries#hasNamedQuery(java.lang.String) - */ public boolean hasQuery(String queryName) { Assert.hasText(queryName, "Query name must not be null or empty!"); @@ -48,10 +44,6 @@ public class PropertiesBasedNamedQueries implements NamedQueries { return properties.containsKey(queryName); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.NamedQueries#getNamedQuery(java.lang.String) - */ public String getQuery(String queryName) { Assert.hasText(queryName, "Query name must not be null or empty!"); diff --git a/src/main/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptor.java b/src/main/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptor.java index b55ca02d5..ae0ff11ba 100644 --- a/src/main/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptor.java +++ b/src/main/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptor.java @@ -121,10 +121,6 @@ class QueryExecutorMethodInterceptor implements MethodInterceptor { } } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Override @Nullable public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { diff --git a/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryFactorySupport.java b/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryFactorySupport.java index ef3fa9d82..ebbca74af 100644 --- a/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryFactorySupport.java +++ b/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryFactorySupport.java @@ -38,10 +38,6 @@ import org.springframework.util.ClassUtils; */ public abstract class ReactiveRepositoryFactorySupport extends RepositoryFactorySupport { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#validate(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected void validate(RepositoryMetadata repositoryMetadata) { diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java index 3d19291ff..d16733ad9 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryComposition.java @@ -323,10 +323,6 @@ public class RepositoryComposition { })); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -341,10 +337,6 @@ public class RepositoryComposition { return ObjectUtils.nullSafeEquals(fragments, that.fragments); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(fragments); @@ -464,10 +456,6 @@ public class RepositoryComposition { return from(Stream.concat(left, right).collect(Collectors.toList())); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator> iterator() { return fragments.iterator(); @@ -563,19 +551,11 @@ public class RepositoryComposition { return fragments.size(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return fragments.toString(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -598,10 +578,6 @@ public class RepositoryComposition { return ObjectUtils.nullSafeEquals(fragments, that.fragments); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(fragmentCache); diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java index c4dade15f..ae70428ec 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java @@ -177,19 +177,11 @@ public abstract class RepositoryFactoryBeanSupport, this.lazyInit = lazy; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { @@ -213,28 +205,16 @@ public abstract class RepositoryFactoryBeanSupport, return Optional.of(new ExtensionAwareQueryMethodEvaluationContextProvider(beanFactory)); } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) - */ @Override public void setApplicationEventPublisher(ApplicationEventPublisher publisher) { this.publisher = publisher; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryInformation#getEntityInformation() - */ @SuppressWarnings("unchecked") public EntityInformation getEntityInformation() { return (EntityInformation) factory.getEntityInformation(repositoryMetadata.getDomainType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryInformation#getRepositoryInformation() - */ public RepositoryInformation getRepositoryInformation() { var fragments = customImplementation.map(RepositoryFragments::just)// @@ -243,54 +223,30 @@ public abstract class RepositoryFactoryBeanSupport, return factory.getRepositoryInformation(repositoryMetadata, fragments); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryInformation#getPersistentEntity() - */ public PersistentEntity getPersistentEntity() { return mappingContext.orElseThrow(() -> new IllegalStateException("No MappingContext available!")) .getRequiredPersistentEntity(repositoryMetadata.getDomainType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryInformation#getQueryMethods() - */ public List getQueryMethods() { return factory.getQueryMethods(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObject() - */ @NonNull public T getObject() { return this.repository.get(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ @NonNull public Class getObjectType() { return repositoryInterface; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#isSingleton() - */ public boolean isSingleton() { return true; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ public void afterPropertiesSet() { this.factory = createRepositoryFactory(); diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java index 758bc973b..e88955528 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java @@ -139,20 +139,12 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, this.namedQueries = namedQueries == null ? PropertiesBasedNamedQueries.EMPTY : namedQueries; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.classLoader = classLoader == null ? org.springframework.util.ClassUtils.getDefaultClassLoader() : classLoader; this.projectionFactory = createProjectionFactory(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = beanFactory; @@ -623,10 +615,6 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, : new DefaultRepositoryInvocationMulticaster(methodInvocationListeners); } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { @@ -657,9 +645,6 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, */ private final List queryMethods = new ArrayList<>(); - /* (non-Javadoc) - * @see org.springframework.data.repository.core.support.QueryCreationListener#onCreation(org.springframework.data.repository.query.RepositoryQuery) - */ @Override public void onCreation(RepositoryQuery query) { this.queryMethods.add(query.getQueryMethod()); @@ -706,10 +691,6 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, return this.compositionHash; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -724,10 +705,6 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, return ObjectUtils.nullSafeEquals(repositoryInterfaceName, that.repositoryInterfaceName); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(repositoryInterfaceName); @@ -735,10 +712,6 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware, return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "RepositoryFactorySupport.RepositoryInformationCacheKey(repositoryInterfaceName=" diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFragment.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFragment.java index 1cdf0f61d..ba0b9f35a 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFragment.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFragment.java @@ -127,37 +127,21 @@ public interface RepositoryFragment { this.interfaceOrImplementation = interfaceOrImplementation; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFragment#getSignatureContributor() - */ @Override public Class getSignatureContributor() { return interfaceOrImplementation; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFragment#withImplementation(java.lang.Object) - */ @Override public RepositoryFragment withImplementation(T implementation) { return new ImplementedRepositoryFragment<>(Optional.of(interfaceOrImplementation), implementation); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("StructuralRepositoryFragment %s", ClassUtils.getShortName(interfaceOrImplementation)); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -172,10 +156,6 @@ public interface RepositoryFragment { return ObjectUtils.nullSafeEquals(interfaceOrImplementation, that.interfaceOrImplementation); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(interfaceOrImplementation); @@ -211,37 +191,21 @@ public interface RepositoryFragment { this.optionalImplementation = Optional.of(implementation); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFragment#getSignatureContributor() - */ @SuppressWarnings({ "rawtypes", "unchecked" }) public Class getSignatureContributor() { return interfaceClass.orElse((Class) implementation.getClass()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFragment#getImplementation() - */ @Override public Optional getImplementation() { return optionalImplementation; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFragment#withImplementation(java.lang.Object) - */ @Override public RepositoryFragment withImplementation(T implementation) { return new ImplementedRepositoryFragment<>(interfaceClass, implementation); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -250,10 +214,6 @@ public interface RepositoryFragment { ClassUtils.getShortName(implementation.getClass())); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -276,10 +236,6 @@ public interface RepositoryFragment { return ObjectUtils.nullSafeEquals(optionalImplementation, that.optionalImplementation); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(interfaceClass); diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFragmentsFactoryBean.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFragmentsFactoryBean.java index f1d62a80a..4999943db 100644 --- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFragmentsFactoryBean.java +++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFragmentsFactoryBean.java @@ -55,19 +55,11 @@ public class RepositoryFragmentsFactoryBean this.fragmentBeanNames = fragmentBeanNames; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = beanFactory; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void afterPropertiesSet() { @@ -79,20 +71,12 @@ public class RepositoryFragmentsFactoryBean this.repositoryFragments = RepositoryFragments.from(fragments); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObject() - */ @NonNull @Override public RepositoryFragments getObject() throws Exception { return this.repositoryFragments; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ @NonNull @Override public Class getObjectType() { diff --git a/src/main/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptor.java b/src/main/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptor.java index 040ae9a64..5c88f74c5 100644 --- a/src/main/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptor.java +++ b/src/main/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptor.java @@ -47,10 +47,6 @@ public enum SurroundingTransactionDetectorMethodInterceptor implements MethodInt return Boolean.TRUE == SURROUNDING_TX_ACTIVE.get(); } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(@SuppressWarnings("null") MethodInvocation invocation) throws Throwable { diff --git a/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryFactoryBeanSupport.java b/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryFactoryBeanSupport.java index ca3b8a4c6..036f7d094 100644 --- a/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryFactoryBeanSupport.java +++ b/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryFactoryBeanSupport.java @@ -101,10 +101,6 @@ public abstract class TransactionalRepositoryFactoryBeanSupport targetClass) { diff --git a/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java b/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java index 39508466e..6aa4d314a 100644 --- a/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java +++ b/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java @@ -53,28 +53,16 @@ public abstract class AbstractRepositoryPopulatorFactoryBean this.resources = resources.clone(); } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ public void setApplicationContext(ApplicationContext applicationContext) { this.context = applicationContext; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.config.AbstractFactoryBean#getObjectType() - */ @NonNull @Override public Class getObjectType() { return ResourceReaderRepositoryPopulator.class; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance() - */ @Override protected ResourceReaderRepositoryPopulator createInstance() { @@ -90,10 +78,6 @@ public abstract class AbstractRepositoryPopulatorFactoryBean return initializer; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ public void onApplicationEvent(ContextRefreshedEvent event) { var populator = this.populator; @@ -111,10 +95,6 @@ public abstract class AbstractRepositoryPopulatorFactoryBean protected abstract ResourceReader getResourceReader(); - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.config.AbstractFactoryBean#afterPropertiesSet() - */ @Override public void afterPropertiesSet() throws Exception { diff --git a/src/main/java/org/springframework/data/repository/init/Jackson2RepositoryPopulatorFactoryBean.java b/src/main/java/org/springframework/data/repository/init/Jackson2RepositoryPopulatorFactoryBean.java index f68297353..97465212d 100644 --- a/src/main/java/org/springframework/data/repository/init/Jackson2RepositoryPopulatorFactoryBean.java +++ b/src/main/java/org/springframework/data/repository/init/Jackson2RepositoryPopulatorFactoryBean.java @@ -40,10 +40,6 @@ public class Jackson2RepositoryPopulatorFactoryBean extends AbstractRepositoryPo this.mapper = mapper; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.init.AbstractRepositoryPopulatorFactoryBean#getResourceReader() - */ @Override protected ResourceReader getResourceReader() { return new Jackson2ResourceReader(mapper); diff --git a/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java b/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java index 4f3e1ea56..f30647a97 100644 --- a/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java +++ b/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java @@ -75,10 +75,6 @@ public class Jackson2ResourceReader implements ResourceReader { this.typeKey = typeKey == null ? DEFAULT_TYPE_KEY : typeKey; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.init.ResourceReader#readFrom(org.springframework.core.io.Resource, java.lang.ClassLoader) - */ public Object readFrom(Resource resource, @Nullable ClassLoader classLoader) throws Exception { Assert.notNull(resource, "Resource must not be null!"); diff --git a/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java b/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java index 6694957c8..1a2abe5da 100644 --- a/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java +++ b/src/main/java/org/springframework/data/repository/init/RepositoriesPopulatedEvent.java @@ -50,10 +50,6 @@ public class RepositoriesPopulatedEvent extends ApplicationEvent { this.repositories = repositories; } - /* - * (non-Javadoc) - * @see java.util.EventObject#getSource() - */ @Override public RepositoryPopulator getSource() { return (RepositoryPopulator) super.getSource(); @@ -68,10 +64,6 @@ public class RepositoriesPopulatedEvent extends ApplicationEvent { return repositories; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -87,10 +79,6 @@ public class RepositoriesPopulatedEvent extends ApplicationEvent { return this.source.equals(that.source) && this.repositories.equals(that.repositories); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java b/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java index 54e3e1408..b605f8505 100644 --- a/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java +++ b/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java @@ -98,18 +98,10 @@ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, A this.resources = Arrays.asList(resources); } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) - */ public void setApplicationEventPublisher(ApplicationEventPublisher publisher) { this.publisher = publisher; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.init.RepositoryPopulator#initialize() - */ public void populate(Repositories repositories) { Assert.notNull(repositories, "Repositories must not be null!"); diff --git a/src/main/java/org/springframework/data/repository/init/UnmarshallerRepositoryPopulatorFactoryBean.java b/src/main/java/org/springframework/data/repository/init/UnmarshallerRepositoryPopulatorFactoryBean.java index 8af1aaaeb..39aedc0d8 100644 --- a/src/main/java/org/springframework/data/repository/init/UnmarshallerRepositoryPopulatorFactoryBean.java +++ b/src/main/java/org/springframework/data/repository/init/UnmarshallerRepositoryPopulatorFactoryBean.java @@ -39,9 +39,6 @@ public class UnmarshallerRepositoryPopulatorFactoryBean extends AbstractReposito this.unmarshaller = unmarshaller; } - /* (non-Javadoc) - * @see org.springframework.data.repository.init.AbstractRepositoryPopulatorFactoryBean#getResourceReader() - */ @Override protected ResourceReader getResourceReader() { @@ -54,10 +51,6 @@ public class UnmarshallerRepositoryPopulatorFactoryBean extends AbstractReposito return new UnmarshallingResourceReader(unmarshaller); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.config.AbstractFactoryBean#afterPropertiesSet() - */ @Override public void afterPropertiesSet() throws Exception { diff --git a/src/main/java/org/springframework/data/repository/init/UnmarshallingResourceReader.java b/src/main/java/org/springframework/data/repository/init/UnmarshallingResourceReader.java index ecb284b19..ee911b16b 100644 --- a/src/main/java/org/springframework/data/repository/init/UnmarshallingResourceReader.java +++ b/src/main/java/org/springframework/data/repository/init/UnmarshallingResourceReader.java @@ -39,10 +39,6 @@ public class UnmarshallingResourceReader implements ResourceReader { this.unmarshaller = unmarshaller; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.init.ResourceReader#readFrom(org.springframework.core.io.Resource, java.lang.ClassLoader) - */ public Object readFrom(Resource resource, @Nullable ClassLoader classLoader) throws IOException { Assert.notNull(resource, "Resource must not be null!"); diff --git a/src/main/java/org/springframework/data/repository/query/DefaultParameters.java b/src/main/java/org/springframework/data/repository/query/DefaultParameters.java index 01acdca2a..25537427c 100644 --- a/src/main/java/org/springframework/data/repository/query/DefaultParameters.java +++ b/src/main/java/org/springframework/data/repository/query/DefaultParameters.java @@ -40,19 +40,11 @@ public final class DefaultParameters extends Parameters parameters) { return new DefaultParameters(parameters); diff --git a/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java b/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java index 8c1227196..9679c539a 100644 --- a/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java +++ b/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java @@ -67,10 +67,6 @@ public class ExtensionAwareQueryMethodEvaluationContextProvider implements Query this.delegate = new org.springframework.data.spel.ExtensionAwareEvaluationContextProvider(extensions); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethodEvaluationContextProvider#getEvaluationContext(org.springframework.data.repository.query.Parameters, java.lang.Object[]) - */ @Override public > EvaluationContext getEvaluationContext(T parameters, Object[] parameterValues) { @@ -81,10 +77,6 @@ public class ExtensionAwareQueryMethodEvaluationContextProvider implements Query return evaluationContext; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethodEvaluationContextProvider#getEvaluationContext(org.springframework.data.repository.query.Parameters, java.lang.Object[], ExpressionDependencies) - */ @Override public > EvaluationContext getEvaluationContext(T parameters, Object[] parameterValues, ExpressionDependencies dependencies) { diff --git a/src/main/java/org/springframework/data/repository/query/Parameter.java b/src/main/java/org/springframework/data/repository/query/Parameter.java index 2d30e354a..6b3883649 100644 --- a/src/main/java/org/springframework/data/repository/query/Parameter.java +++ b/src/main/java/org/springframework/data/repository/query/Parameter.java @@ -171,10 +171,6 @@ public class Parameter { return parameter.hasParameterAnnotation(Param.class); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return format("%s:%s", isNamedParameter() ? getName() : "#" + getIndex(), getType().getName()); diff --git a/src/main/java/org/springframework/data/repository/query/Parameters.java b/src/main/java/org/springframework/data/repository/query/Parameters.java index e3467e163..2e7501cdf 100644 --- a/src/main/java/org/springframework/data/repository/query/Parameters.java +++ b/src/main/java/org/springframework/data/repository/query/Parameters.java @@ -332,10 +332,6 @@ public abstract class Parameters, T extends Parameter return !TYPES.contains(type); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return parameters.iterator(); } diff --git a/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java b/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java index 4daa69131..79d33f960 100644 --- a/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java +++ b/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java @@ -91,10 +91,6 @@ public class ParametersParameterAccessor implements ParameterAccessor { return this.values; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getPageable() - */ @Override public Pageable getPageable() { @@ -107,10 +103,6 @@ public class ParametersParameterAccessor implements ParameterAccessor { return pageable == null ? Pageable.unpaged() : pageable; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getSort() - */ @Override public Sort getSort() { @@ -152,19 +144,11 @@ public class ParametersParameterAccessor implements ParameterAccessor { return (T) values[index]; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int) - */ @Override public Object getBindableValue(int index) { return values[parameters.getBindableParameter(index).getIndex()]; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue() - */ @Override public boolean hasBindableNullValue() { @@ -177,10 +161,6 @@ public class ParametersParameterAccessor implements ParameterAccessor { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#iterator() - */ @Override public BindableParameterIterator iterator() { return new BindableParameterIterator(this); @@ -222,19 +202,11 @@ public class ParametersParameterAccessor implements ParameterAccessor { return accessor.getBindableValue(currentIndex++); } - /* - * (non-Javadoc) - * @see java.util.Iterator#hasNext() - */ @Override public boolean hasNext() { return bindableParameterCount > currentIndex; } - /* - * (non-Javadoc) - * @see java.util.Iterator#remove() - */ @Override public void remove() { throw new UnsupportedOperationException(); diff --git a/src/main/java/org/springframework/data/repository/query/QueryMethod.java b/src/main/java/org/springframework/data/repository/query/QueryMethod.java index 4b2711c27..0aee4479d 100644 --- a/src/main/java/org/springframework/data/repository/query/QueryMethod.java +++ b/src/main/java/org/springframework/data/repository/query/QueryMethod.java @@ -249,10 +249,6 @@ public class QueryMethod { return method; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return method.toString(); diff --git a/src/main/java/org/springframework/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java b/src/main/java/org/springframework/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java index c99bf47d3..912aad2c0 100644 --- a/src/main/java/org/springframework/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java +++ b/src/main/java/org/springframework/data/repository/query/ReactiveExtensionAwareQueryMethodEvaluationContextProvider.java @@ -68,10 +68,6 @@ public class ReactiveExtensionAwareQueryMethodEvaluationContextProvider this.delegate = new ReactiveExtensionAwareEvaluationContextProvider(extensions); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethodEvaluationContextProvider#getEvaluationContext(org.springframework.data.repository.query.Parameters, java.lang.Object[]) - */ @Override public > EvaluationContext getEvaluationContext(T parameters, Object[] parameterValues) { @@ -85,10 +81,6 @@ public class ReactiveExtensionAwareQueryMethodEvaluationContextProvider return evaluationContext; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethodEvaluationContextProvider#getEvaluationContext(org.springframework.data.repository.query.Parameters, java.lang.Object[], org.springframework.data.spel.ExpressionDependencies) - */ @Override public > EvaluationContext getEvaluationContext(T parameters, Object[] parameterValues, ExpressionDependencies dependencies) { @@ -103,10 +95,6 @@ public class ReactiveExtensionAwareQueryMethodEvaluationContextProvider return evaluationContext; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReactiveQueryMethodEvaluationContextProvider#getEvaluationContext(org.springframework.data.repository.query.Parameters, java.lang.Object[]) - */ @Override public > Mono getEvaluationContextLater(T parameters, Object[] parameterValues) { @@ -119,10 +107,6 @@ public class ReactiveExtensionAwareQueryMethodEvaluationContextProvider .cast(EvaluationContext.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReactiveQueryMethodEvaluationContextProvider#getEvaluationContextLater(org.springframework.data.repository.query.Parameters, java.lang.Object[], org.springframework.data.spel.ExpressionDependencies) - */ @Override public > Mono getEvaluationContextLater(T parameters, Object[] parameterValues, ExpressionDependencies dependencies) { diff --git a/src/main/java/org/springframework/data/repository/query/ResultProcessor.java b/src/main/java/org/springframework/data/repository/query/ResultProcessor.java index 6e7142790..7c22a142d 100644 --- a/src/main/java/org/springframework/data/repository/query/ResultProcessor.java +++ b/src/main/java/org/springframework/data/repository/query/ResultProcessor.java @@ -229,10 +229,6 @@ public class ResultProcessor { }); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public Object convert(Object source) { @@ -250,10 +246,6 @@ public class ResultProcessor { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object convert(Object source) { return source; @@ -295,10 +287,6 @@ public class ResultProcessor { return new ProjectingConverter(type, factory, conversionService); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public Object convert(Object source) { diff --git a/src/main/java/org/springframework/data/repository/query/ReturnedType.java b/src/main/java/org/springframework/data/repository/query/ReturnedType.java index 1c6dda0fb..36ce46c5e 100644 --- a/src/main/java/org/springframework/data/repository/query/ReturnedType.java +++ b/src/main/java/org/springframework/data/repository/query/ReturnedType.java @@ -157,46 +157,26 @@ public abstract class ReturnedType { this.domainType = domainType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReturnedType#getReturnedType() - */ @Override public Class getReturnedType() { return information.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReturnedType#needsCustomConstruction() - */ public boolean needsCustomConstruction() { return isProjecting() && information.isClosed(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReturnedType#isProjecting() - */ @Override public boolean isProjecting() { return !information.getType().isAssignableFrom(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReturnedType#getTypeToRead() - */ @Nullable @Override public Class getTypeToRead() { return isProjecting() && information.isClosed() ? null : domainType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReturnedType#getInputProperties() - */ @Override public List getInputProperties() { @@ -243,45 +223,25 @@ public abstract class ReturnedType { this.inputProperties = detectConstructorParameterNames(returnedType); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ResultFactory.ReturnedTypeInformation#getReturnedType() - */ @Override public Class getReturnedType() { return type; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ResultFactory.ReturnedType#getTypeToRead() - */ @NonNull public Class getTypeToRead() { return type; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ResultFactory.ReturnedType#isProjecting() - */ @Override public boolean isProjecting() { return isDto(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ResultFactory.ReturnedType#needsCustomConstruction() - */ public boolean needsCustomConstruction() { return isDto() && !inputProperties.isEmpty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ResultFactory.ReturnedTypeInformation#getInputProperties() - */ @Override public List getInputProperties() { return inputProperties; @@ -356,10 +316,6 @@ public abstract class ReturnedType { return this.projectionFactoryHashCode; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -382,10 +338,6 @@ public abstract class ReturnedType { return ObjectUtils.nullSafeEquals(domainType, cacheKey.domainType); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(returnedType); @@ -394,10 +346,6 @@ public abstract class ReturnedType { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "ReturnedType.CacheKey(returnedType=" + this.getReturnedType() + ", domainType=" + this.getDomainType() diff --git a/src/main/java/org/springframework/data/repository/query/parser/OrderBySource.java b/src/main/java/org/springframework/data/repository/query/parser/OrderBySource.java index 85eaa5c36..6ca6f1b69 100644 --- a/src/main/java/org/springframework/data/repository/query/parser/OrderBySource.java +++ b/src/main/java/org/springframework/data/repository/query/parser/OrderBySource.java @@ -126,10 +126,6 @@ class OrderBySource { return Sort.by(this.orders); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "Order By " + StringUtils.collectionToDelimitedString(orders, ", "); diff --git a/src/main/java/org/springframework/data/repository/query/parser/Part.java b/src/main/java/org/springframework/data/repository/query/parser/Part.java index 199f2a6e9..1a579c947 100644 --- a/src/main/java/org/springframework/data/repository/query/parser/Part.java +++ b/src/main/java/org/springframework/data/repository/query/parser/Part.java @@ -129,10 +129,6 @@ public class Part { return ignoreCase; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -155,10 +151,6 @@ public class Part { return ignoreCase == part.ignoreCase; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(propertyPath); @@ -167,10 +159,6 @@ public class Part { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s %s %s", propertyPath.getSegment(), type, ignoreCase); @@ -310,10 +298,6 @@ public class Part { return candidate; } - /* - * (non-Javadoc) - * @see java.lang.Enum#toString() - */ @Override public String toString() { return String.format("%s (%s): %s", name(), getNumberOfArguments(), getKeywords()); diff --git a/src/main/java/org/springframework/data/repository/query/parser/PartTree.java b/src/main/java/org/springframework/data/repository/query/parser/PartTree.java index 0ba1890ef..a73e92aed 100644 --- a/src/main/java/org/springframework/data/repository/query/parser/PartTree.java +++ b/src/main/java/org/springframework/data/repository/query/parser/PartTree.java @@ -95,10 +95,6 @@ public class PartTree implements Streamable { } } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return predicate.iterator(); } @@ -199,10 +195,6 @@ public class PartTree implements Streamable { return predicate.iterator().hasNext(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -253,10 +245,6 @@ public class PartTree implements Streamable { return children.iterator(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return StringUtils.collectionToDelimitedString(children, " and "); @@ -402,10 +390,6 @@ public class PartTree implements Streamable { return orderBySource; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return nodes.iterator(); diff --git a/src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java index afe2d15c3..dc6d37606 100644 --- a/src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java +++ b/src/main/java/org/springframework/data/repository/support/CrudRepositoryInvoker.java @@ -63,47 +63,27 @@ class CrudRepositoryInvoker extends ReflectionRepositoryInvoker { this.repository = repository; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeFindAll(org.springframework.data.domain.Sort) - */ @Override public Iterable invokeFindAll(Sort sort) { return customFindAllMethod ? super.invokeFindAll(sort) : repository.findAll(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeFindAll(org.springframework.data.domain.Pageable) - */ @Override public Iterable invokeFindAll(Pageable pageable) { return customFindAllMethod ? super.invokeFindAll(pageable) : repository.findAll(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.ReflectionRepositoryInvoker#invokeFindById(java.lang.Object) - */ @Override @SuppressWarnings("unchecked") public Optional invokeFindById(Object id) { return customFindOneMethod ? super.invokeFindById(id) : (Optional) repository.findById(convertId(id)); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.ReflectionRepositoryInvoker#invokeSave(java.lang.Object) - */ @Override public T invokeSave(T entity) { return customSaveMethod ? super.invokeSave(entity) : repository.save(entity); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.ReflectionRepositoryInvoker#invokeDeleteById(java.lang.Object) - */ @Override public void invokeDeleteById(Object id) { diff --git a/src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java b/src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java index 5c43f19ce..bdd9195e5 100644 --- a/src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java +++ b/src/main/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactory.java @@ -69,10 +69,6 @@ public class DefaultRepositoryInvokerFactory implements RepositoryInvokerFactory this.invokers = new ConcurrentHashMap<>(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvokerFactory#getInvokerFor(java.lang.Class) - */ @Override public RepositoryInvoker getInvokerFor(Class domainType) { return invokers.computeIfAbsent(domainType, this::prepareInvokers); diff --git a/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java b/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java index 97bbba40b..d7aceb2d9 100644 --- a/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java +++ b/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java @@ -63,30 +63,18 @@ public class DomainClassConverter getConvertibleTypes() { return Collections.singleton(new ConvertiblePair(Object.class, Object.class)); } - /* - * (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) { return getConverter(targetType).map(it -> it.convert(source, sourceType, targetType)).orElse(null); } - /* - * (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) { return getConverter(targetType).map(it -> it.matches(sourceType, targetType)).orElse(false); @@ -100,10 +88,6 @@ public class DomainClassConverter { @@ -142,20 +126,12 @@ public class DomainClassConverter getConvertibleTypes() { return Collections.singleton(new ConvertiblePair(Object.class, Object.class)); } - /* - * (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) { @@ -177,10 +153,6 @@ public class DomainClassConverter getConvertibleTypes() { return Collections.singleton(new ConvertiblePair(Object.class, Object.class)); } - /* - * (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) { @@ -257,10 +221,6 @@ public class DomainClassConverter invokeFindAll(Sort sort) { return customFindAll ? invokeFindAllReflectively(sort) : repository.findAll(sort); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.CrudRepositoryInvoker#invokePagedFindAll(java.util.Optional) - */ @Override public Iterable invokeFindAll(Pageable pageable) { return customFindAll ? invokeFindAllReflectively(pageable) : repository.findAll(pageable); diff --git a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java index 1f0715c18..1a8fe767e 100644 --- a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java +++ b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java @@ -74,46 +74,26 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker { this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvocationInformation#hasFindAllMethod() - */ @Override public boolean hasFindAllMethod() { return methods.hasFindAllMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeSortedFindAll(java.util.Optional) - */ @Override public Iterable invokeFindAll(Sort sort) { return invokeFindAllReflectively(sort); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokePagedFindAll(java.util.Optional) - */ @Override public Iterable invokeFindAll(Pageable pageable) { return invokeFindAllReflectively(pageable); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvocationInformation#hasSaveMethod() - */ @Override public boolean hasSaveMethod() { return methods.hasSaveMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeSave(java.lang.Object) - */ @Override public T invokeSave(T object) { @@ -123,19 +103,11 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker { return invokeForNonNullResult(method, object); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvocationInformation#hasFindOneMethod() - */ @Override public boolean hasFindOneMethod() { return methods.hasFindOneMethod(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeFindById(java.lang.Object) - */ @Override public Optional invokeFindById(Object id) { @@ -145,19 +117,11 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker { return returnAsOptional(invoke(method, convertId(id))); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvocationInformation#hasDeleteMethod() - */ @Override public boolean hasDeleteMethod() { return methods.hasDelete(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeDeleteById(java.lang.Object) - */ @Override public void invokeDeleteById(Object id) { @@ -173,10 +137,6 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeQueryMethod(java.lang.reflect.Method, java.util.Map, org.springframework.data.domain.Pageable, org.springframework.data.domain.Sort) - */ @Override public Optional invokeQueryMethod(Method method, MultiValueMap parameters, Pageable pageable, Sort sort) { diff --git a/src/main/java/org/springframework/data/repository/support/Repositories.java b/src/main/java/org/springframework/data/repository/support/Repositories.java index 4d231f1f6..928ffcdee 100644 --- a/src/main/java/org/springframework/data/repository/support/Repositories.java +++ b/src/main/java/org/springframework/data/repository/support/Repositories.java @@ -272,10 +272,6 @@ public class Repositories implements Iterable> { return getRepositoryFactoryInfoFor(domainClass).getQueryMethods(); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator> iterator() { return repositoryFactoryInfos.keySet().iterator(); } diff --git a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java index 63f30356c..506eb9a41 100644 --- a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java +++ b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java @@ -305,11 +305,6 @@ public abstract class QueryExecutionConverters { this.wrapperTypes = wrapperTypes; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ - @Override public Set getConvertibleTypes() { @@ -318,10 +313,6 @@ public abstract class QueryExecutionConverters { .stream().collect(StreamUtils.toUnmodifiableSet()); } - /* - * (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 final Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -360,10 +351,6 @@ public abstract class QueryExecutionConverters { super(new AsyncResult<>(null), Arrays.asList(Future.class, ListenableFuture.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.util.QueryExecutionConverters.AbstractWrapperTypeConverter#wrap(java.lang.Object) - */ @Override protected Object wrap(Object source) { return new AsyncResult<>(source); @@ -384,10 +371,6 @@ public abstract class QueryExecutionConverters { super(CompletableFuture.completedFuture(null)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.util.QueryExecutionConverters.AbstractWrapperTypeConverter#wrap(java.lang.Object) - */ @Override protected Object wrap(Object source) { return source instanceof CompletableFuture ? source : CompletableFuture.completedFuture(source); @@ -408,10 +391,6 @@ public abstract class QueryExecutionConverters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override @SuppressWarnings("unchecked") @@ -435,19 +414,11 @@ public abstract class QueryExecutionConverters { IterableToStreamableConverter() {} - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @Override public Set getConvertibleTypes() { return Collections.singleton(new ConvertiblePair(Iterable.class, Object.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) { @@ -468,10 +439,6 @@ public abstract class QueryExecutionConverters { }); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @SuppressWarnings("unchecked") @Nullable @Override @@ -502,10 +469,6 @@ public abstract class QueryExecutionConverters { return cardinality; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -524,10 +487,6 @@ public abstract class QueryExecutionConverters { return cardinality == that.cardinality; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(type); @@ -535,10 +494,6 @@ public abstract class QueryExecutionConverters { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "QueryExecutionConverters.WrapperType(type=" + this.getType() + ", cardinality=" + this.getCardinality() diff --git a/src/main/java/org/springframework/data/repository/util/VavrCollections.java b/src/main/java/org/springframework/data/repository/util/VavrCollections.java index 30e83be30..5deb0a184 100644 --- a/src/main/java/org/springframework/data/repository/util/VavrCollections.java +++ b/src/main/java/org/springframework/data/repository/util/VavrCollections.java @@ -50,10 +50,6 @@ class VavrCollections { return WrapperType.multiValue(io.vavr.collection.Traversable.class); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @NonNull @Override public Object convert(Object source) { @@ -78,20 +74,12 @@ class VavrCollections { INSTANCE { - /* - * (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) { @@ -109,10 +97,6 @@ class VavrCollections { 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/spel/EvaluationContextExtensionInformation.java b/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java index 1aaaef658..e45c29d62 100644 --- a/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java +++ b/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java @@ -209,10 +209,6 @@ class EvaluationContextExtensionInformation { this.staticOnly = staticOnly; } - /* - * (non-Javadoc) - * @see org.springframework.util.ReflectionUtils.MethodFilter#matches(java.lang.reflect.Method) - */ @Override public boolean matches(Method method) { @@ -226,10 +222,6 @@ class EvaluationContextExtensionInformation { return Modifier.isPublic(method.getModifiers()) && staticMatch; } - /* - * (non-Javadoc) - * @see org.springframework.util.ReflectionUtils.FieldFilter#matches(java.lang.reflect.Field) - */ @Override public boolean matches(Field field) { diff --git a/src/main/java/org/springframework/data/spel/ExpressionDependencies.java b/src/main/java/org/springframework/data/spel/ExpressionDependencies.java index f63ffde78..5a4d91295 100644 --- a/src/main/java/org/springframework/data/spel/ExpressionDependencies.java +++ b/src/main/java/org/springframework/data/spel/ExpressionDependencies.java @@ -161,19 +161,11 @@ public class ExpressionDependencies implements Streamable(dependencySet)); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return this.dependencies.iterator(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -185,10 +177,6 @@ public class ExpressionDependencies implements Streamable getType() { return (Class) Array.newInstance(resolveType(type.getGenericComponentType()), 0).getClass(); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeDiscoverer#doGetComponentType() - */ @Override @NonNull protected TypeInformation doGetComponentType() { @@ -64,10 +56,6 @@ class GenericArrayTypeInformation extends ParentTypeAwareTypeInformation { return createInfo(componentType); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return type.toString(); diff --git a/src/main/java/org/springframework/data/util/Lazy.java b/src/main/java/org/springframework/data/util/Lazy.java index a34fa3636..c10225b19 100644 --- a/src/main/java/org/springframework/data/util/Lazy.java +++ b/src/main/java/org/springframework/data/util/Lazy.java @@ -231,10 +231,6 @@ public class Lazy implements Supplier { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object o) { @@ -257,10 +253,6 @@ public class Lazy implements Supplier { return ObjectUtils.nullSafeEquals(value, lazy.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/data/util/LazyStreamable.java b/src/main/java/org/springframework/data/util/LazyStreamable.java index d743fcc22..ad96600ad 100644 --- a/src/main/java/org/springframework/data/util/LazyStreamable.java +++ b/src/main/java/org/springframework/data/util/LazyStreamable.java @@ -37,19 +37,11 @@ final class LazyStreamable implements Streamable { return new LazyStreamable(stream); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return stream().iterator(); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.Streamable#stream() - */ @Override public Stream stream() { return stream.get(); @@ -59,10 +51,6 @@ final class LazyStreamable implements Streamable { return this.stream; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "LazyStreamable(stream=" + this.getStream() + ")"; diff --git a/src/main/java/org/springframework/data/util/MethodInvocationRecorder.java b/src/main/java/org/springframework/data/util/MethodInvocationRecorder.java index 8bcf2eb5c..a479dd8f1 100644 --- a/src/main/java/org/springframework/data/util/MethodInvocationRecorder.java +++ b/src/main/java/org/springframework/data/util/MethodInvocationRecorder.java @@ -108,10 +108,6 @@ public class MethodInvocationRecorder { private InvocationInformation information = InvocationInformation.NOT_INVOKED; - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Override @SuppressWarnings("null") public Object invoke(MethodInvocation invocation) throws Throwable { @@ -218,10 +214,6 @@ public class MethodInvocationRecorder { return this.invokedMethod; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object o) { @@ -240,10 +232,6 @@ public class MethodInvocationRecorder { return ObjectUtils.nullSafeEquals(invokedMethod, that.invokedMethod); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -254,10 +242,6 @@ public class MethodInvocationRecorder { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "MethodInvocationRecorder.InvocationInformation(recorded=" + this.getRecorded() + ", invokedMethod=" @@ -275,10 +259,6 @@ public class MethodInvocationRecorder { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.hateoas.core.Recorder.PropertyNameDetectionStrategy#getPropertyName(java.lang.reflect.Method) - */ @NonNull @Override public String getPropertyName(Method method) { @@ -366,10 +346,6 @@ public class MethodInvocationRecorder { return new Recorded(converter.apply(currentInstance).values().iterator().next(), recorder); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -388,10 +364,6 @@ public class MethodInvocationRecorder { super(null, null); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.MethodInvocationRecorder.Recorded#getPropertyPath(java.util.List) - */ @Override public Optional getPropertyPath(List strategies) { return Optional.empty(); diff --git a/src/main/java/org/springframework/data/util/MultiValueMapCollector.java b/src/main/java/org/springframework/data/util/MultiValueMapCollector.java index 44ceaa111..91a612020 100644 --- a/src/main/java/org/springframework/data/util/MultiValueMapCollector.java +++ b/src/main/java/org/springframework/data/util/MultiValueMapCollector.java @@ -47,28 +47,16 @@ class MultiValueMapCollector implements Collector(keyFunction, valueFunction); } - /* - * (non-Javadoc) - * @see java.util.stream.Collector#supplier() - */ @Override public Supplier> supplier() { return () -> CollectionUtils.toMultiValueMap(new HashMap<>()); } - /* - * (non-Javadoc) - * @see java.util.stream.Collector#accumulator() - */ @Override public BiConsumer, T> accumulator() { return (map, t) -> map.add(keyFunction.apply(t), valueFunction.apply(t)); } - /* - * (non-Javadoc) - * @see java.util.stream.Collector#combiner() - */ @Override public BinaryOperator> combiner() { @@ -82,19 +70,11 @@ class MultiValueMapCollector implements Collector, MultiValueMap> finisher() { return Function.identity(); } - /* - * (non-Javadoc) - * @see java.util.stream.Collector#characteristics() - */ @Override public Set characteristics() { return EnumSet.of(Characteristics.IDENTITY_FINISH, Characteristics.UNORDERED); diff --git a/src/main/java/org/springframework/data/util/NullableWrapperConverters.java b/src/main/java/org/springframework/data/util/NullableWrapperConverters.java index 77ff3c07d..57033d55c 100644 --- a/src/main/java/org/springframework/data/util/NullableWrapperConverters.java +++ b/src/main/java/org/springframework/data/util/NullableWrapperConverters.java @@ -243,10 +243,6 @@ public abstract class NullableWrapperConverters { this.wrapperTypes = wrapperTypes; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @Override public Set getConvertibleTypes() { @@ -255,10 +251,6 @@ public abstract class NullableWrapperConverters { .stream().collect(StreamUtils.toUnmodifiableSet()); } - /* - * (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 final Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -295,10 +287,6 @@ public abstract class NullableWrapperConverters { super(java.util.Optional.empty()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.util.QueryExecutionConverters.AbstractWrapperTypeConverter#wrap(java.lang.Object) - */ @Override protected Object wrap(Object source) { return java.util.Optional.of(source); @@ -322,10 +310,6 @@ public abstract class NullableWrapperConverters { super(Optional.absent(), Collections.singleton(Optional.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.util.QueryExecutionConverters.AbstractWrapperTypeConverter#wrap(java.lang.Object) - */ @Override protected Object wrap(Object source) { return Optional.of(source); @@ -350,10 +334,6 @@ public abstract class NullableWrapperConverters { super(Option.empty(), Collections.singleton(Option.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.util.QueryExecutionConverters.AbstractWrapperTypeConverter#wrap(java.lang.Object) - */ @Override protected Object wrap(Object source) { return Option.apply(source); @@ -381,10 +361,6 @@ public abstract class NullableWrapperConverters { return WrapperType.singleValue(io.vavr.control.Option.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.util.QueryExecutionConverters.AbstractWrapperTypeConverter#wrap(java.lang.Object) - */ @Override protected Object wrap(Object source) { return io.vavr.control.Option.of(source); @@ -400,10 +376,6 @@ public abstract class NullableWrapperConverters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public Object convert(Object source) { @@ -420,10 +392,6 @@ public abstract class NullableWrapperConverters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public Object convert(Object source) { @@ -444,10 +412,6 @@ public abstract class NullableWrapperConverters { private final Function0 alternative = new AbstractFunction0() { - /* - * (non-Javadoc) - * @see scala.Function0#apply() - */ @Nullable @Override public Option apply() { @@ -455,10 +419,6 @@ public abstract class NullableWrapperConverters { } }; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public Object convert(Object source) { @@ -476,10 +436,6 @@ public abstract class NullableWrapperConverters { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override @SuppressWarnings("unchecked") @@ -508,10 +464,6 @@ public abstract class NullableWrapperConverters { return cardinality; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -530,10 +482,6 @@ public abstract class NullableWrapperConverters { return cardinality == that.cardinality; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(type); @@ -541,10 +489,6 @@ public abstract class NullableWrapperConverters { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "WrapperType(type=" + this.getType() + ", cardinality=" + this.getCardinality() + ")"; diff --git a/src/main/java/org/springframework/data/util/Pair.java b/src/main/java/org/springframework/data/util/Pair.java index 222799f96..1da0ccf4c 100644 --- a/src/main/java/org/springframework/data/util/Pair.java +++ b/src/main/java/org/springframework/data/util/Pair.java @@ -86,10 +86,6 @@ public final class Pair { return Collectors.toMap(Pair::getFirst, Pair::getSecond); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object o) { @@ -108,10 +104,6 @@ public final class Pair { return ObjectUtils.nullSafeEquals(second, pair.second); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(first); @@ -119,10 +111,6 @@ public final class Pair { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("%s->%s", this.first, this.second); diff --git a/src/main/java/org/springframework/data/util/ParameterTypes.java b/src/main/java/org/springframework/data/util/ParameterTypes.java index 986121190..1d54c9686 100644 --- a/src/main/java/org/springframework/data/util/ParameterTypes.java +++ b/src/main/java/org/springframework/data/util/ParameterTypes.java @@ -182,10 +182,6 @@ public class ParameterTypes { return true; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -278,10 +274,6 @@ public class ParameterTypes { return types.get(types.size() - 1); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object o) { @@ -296,10 +288,6 @@ public class ParameterTypes { return ObjectUtils.nullSafeEquals(types, that.types); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(types); @@ -325,19 +313,11 @@ public class ParameterTypes { return new ParentParameterTypes(types, tail); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParameterTypes#getParent() - */ @Override protected Optional getParent() { return super.getParent(tail); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParameterTypes#withLastVarArgs() - */ @Override protected Optional withLastVarArgs() { @@ -346,10 +326,6 @@ public class ParameterTypes { : super.withLastVarArgs(); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParentTypeAwareTypeInformation#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object o) { @@ -368,10 +344,6 @@ public class ParameterTypes { return ObjectUtils.nullSafeEquals(tail, that.tail); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java b/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java index f70c86945..f85d681ea 100644 --- a/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java +++ b/src/main/java/org/springframework/data/util/ParameterizedTypeInformation.java @@ -59,10 +59,6 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation this.resolved = Lazy.of(() -> isResolvedCompletely()); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeDiscoverer#doGetMapValueType() - */ @Override @Nullable protected TypeInformation doGetMapValueType() { @@ -95,10 +91,6 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation return result.orElseGet(super::doGetMapValueType); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeDiscoverer#getTypeParameters() - */ @Override public List> getTypeArguments() { @@ -111,10 +103,6 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation return result; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeDiscoverer#isAssignableFrom(org.springframework.data.util.TypeInformation) - */ @Override public boolean isAssignableFrom(TypeInformation target) { @@ -149,10 +137,6 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation return true; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeDiscoverer#doGetComponentType() - */ @Override @Nullable protected TypeInformation doGetComponentType() { @@ -166,10 +150,6 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation return createInfo(type.getActualTypeArguments()[0]); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeDiscoverer#specialize(org.springframework.data.util.ClassTypeInformation) - */ @Override @SuppressWarnings("unchecked") public TypeInformation specialize(ClassTypeInformation type) { @@ -189,10 +169,6 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation : super.specialize(type); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParentTypeAwareTypeInformation#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -211,19 +187,11 @@ class ParameterizedTypeInformation extends ParentTypeAwareTypeInformation return super.equals(obj); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParentTypeAwareTypeInformation#hashCode() - */ @Override public int hashCode() { return isResolved() ? this.type.hashCode() : super.hashCode(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/src/main/java/org/springframework/data/util/ParentTypeAwareTypeInformation.java b/src/main/java/org/springframework/data/util/ParentTypeAwareTypeInformation.java index 1ef336b27..3f49cd20f 100644 --- a/src/main/java/org/springframework/data/util/ParentTypeAwareTypeInformation.java +++ b/src/main/java/org/springframework/data/util/ParentTypeAwareTypeInformation.java @@ -47,10 +47,6 @@ public abstract class ParentTypeAwareTypeInformation extends TypeDiscoverer createInfo(Type fieldType) { @@ -61,10 +57,6 @@ public abstract class ParentTypeAwareTypeInformation extends TypeDiscoverer extends TypeDiscoverer implements Consumer { return value; } - /* - * (non-Javadoc) - * @see java.util.function.Consumer#accept(java.lang.Object) - */ @Override public void accept(@Nullable T t) { this.value = t; diff --git a/src/main/java/org/springframework/data/util/Streamable.java b/src/main/java/org/springframework/data/util/Streamable.java index 1bd33f470..16c0dfeb5 100644 --- a/src/main/java/org/springframework/data/util/Streamable.java +++ b/src/main/java/org/springframework/data/util/Streamable.java @@ -213,10 +213,6 @@ public interface Streamable extends Iterable, Supplier> { return stream().collect(StreamUtils.toUnmodifiableSet()); } - /* - * (non-Javadoc) - * @see java.util.function.Supplier#get() - */ default Stream get() { return stream(); } diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java index 56fb23d65..bfd5c3c69 100644 --- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java +++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java @@ -172,10 +172,6 @@ class TypeDiscoverer implements TypeInformation { return (Class) GenericTypeResolver.resolveType(type, map); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getParameterTypes(java.lang.reflect.Constructor) - */ public List> getParameterTypes(Constructor constructor) { Assert.notNull(constructor, "Constructor must not be null!"); @@ -187,10 +183,6 @@ class TypeDiscoverer implements TypeInformation { return parameterTypes; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getProperty(java.lang.String) - */ @Nullable public TypeInformation getProperty(String fieldname) { @@ -281,27 +273,15 @@ class TypeDiscoverer implements TypeInformation { return parameterTypes.length == 0 ? null : parameterTypes[0]; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getType() - */ public Class getType() { return resolvedType.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getRawTypeInformation() - */ @Override public ClassTypeInformation getRawTypeInformation() { return ClassTypeInformation.from(getType()).getRawTypeInformation(); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getActualType() - */ @Nullable public TypeInformation getActualType() { @@ -322,10 +302,6 @@ class TypeDiscoverer implements TypeInformation { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#isMap() - */ public boolean isMap() { var type = getType(); @@ -339,10 +315,6 @@ class TypeDiscoverer implements TypeInformation { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getMapValueType() - */ @Nullable public TypeInformation getMapValueType() { return valueType.orElse(null); @@ -354,10 +326,6 @@ class TypeDiscoverer implements TypeInformation { : getTypeArguments().stream().skip(1).findFirst().orElse(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#isCollectionLike() - */ public boolean isCollectionLike() { Class rawType = getType(); @@ -368,10 +336,6 @@ class TypeDiscoverer implements TypeInformation { || Streamable.class.isAssignableFrom(rawType); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getComponentType() - */ @Nullable public final TypeInformation getComponentType() { return componentType.orElse(null); @@ -403,20 +367,12 @@ class TypeDiscoverer implements TypeInformation { return arguments.size() > 0 ? arguments.get(0) : null; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getReturnType(java.lang.reflect.Method) - */ public TypeInformation getReturnType(Method method) { Assert.notNull(method, "Method must not be null!"); return createInfo(method.getGenericReturnType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getMethodParameterTypes(java.lang.reflect.Method) - */ public List> getParameterTypes(Method method) { Assert.notNull(method, "Method most not be null!"); @@ -426,10 +382,6 @@ class TypeDiscoverer implements TypeInformation { .collect(Collectors.toList()); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getSuperTypeInformation(java.lang.Class) - */ @Nullable public TypeInformation getSuperTypeInformation(Class superType) { @@ -471,17 +423,10 @@ class TypeDiscoverer implements TypeInformation { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#getTypeParameters() - */ public List> getTypeArguments() { return Collections.emptyList(); } - /* (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#isAssignableFrom(org.springframework.data.util.TypeInformation) - */ public boolean isAssignableFrom(TypeInformation target) { var superTypeInformation = target.getSuperTypeInformation(getType()); @@ -489,10 +434,6 @@ class TypeDiscoverer implements TypeInformation { return superTypeInformation == null ? false : superTypeInformation.equals(this); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.TypeInformation#specialize(org.springframework.data.util.ClassTypeInformation) - */ @Override @SuppressWarnings("unchecked") public TypeInformation specialize(ClassTypeInformation type) { @@ -539,10 +480,6 @@ class TypeDiscoverer implements TypeInformation { return NullableWrapperConverters.supports(getType()); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -571,10 +508,6 @@ class TypeDiscoverer implements TypeInformation { return this.typeVariableMap.equals(that.typeVariableMap); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return hashCode; @@ -596,29 +529,17 @@ class TypeDiscoverer implements TypeInformation { this.typeParameters = typeParameters; } - /* - * (non-Javadoc) - * @see java.lang.reflect.ParameterizedType#getRawType() - */ @Override public Type getRawType() { return typeInformation.getType(); } - /* - * (non-Javadoc) - * @see java.lang.reflect.ParameterizedType#getOwnerType() - */ @Override @Nullable public Type getOwnerType() { return null; } - /* - * (non-Javadoc) - * @see java.lang.reflect.ParameterizedType#getActualTypeArguments() - */ @Override public Type[] getActualTypeArguments() { @@ -631,10 +552,6 @@ class TypeDiscoverer implements TypeInformation { return result; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParentTypeAwareTypeInformation#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object o) { @@ -653,10 +570,6 @@ class TypeDiscoverer implements TypeInformation { return ObjectUtils.nullSafeEquals(typeParameters, that.typeParameters); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { var result = ObjectUtils.nullSafeHashCode(typeInformation); diff --git a/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java b/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java index 7ce0ee26e..022c717a5 100644 --- a/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java +++ b/src/main/java/org/springframework/data/util/TypeVariableTypeInformation.java @@ -50,10 +50,6 @@ class TypeVariableTypeInformation extends ParentTypeAwareTypeInformation { this.variable = variable; } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParentTypeAwareTypeInformation#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -68,10 +64,6 @@ class TypeVariableTypeInformation extends ParentTypeAwareTypeInformation { return getType().equals(that.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.util.ParentTypeAwareTypeInformation#hashCode() - */ @Override public int hashCode() { @@ -82,10 +74,6 @@ class TypeVariableTypeInformation extends ParentTypeAwareTypeInformation { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return variable.getName(); diff --git a/src/main/java/org/springframework/data/util/Version.java b/src/main/java/org/springframework/data/util/Version.java index 91b0b9bd5..6cb7bdef2 100644 --- a/src/main/java/org/springframework/data/util/Version.java +++ b/src/main/java/org/springframework/data/util/Version.java @@ -146,10 +146,6 @@ public class Version implements Comparable { return compareTo(version) <= 0; } - /* - * (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ public int compareTo(@SuppressWarnings("null") Version that) { if (major != that.major) { @@ -171,10 +167,6 @@ public class Version implements Comparable { return 0; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(@Nullable Object obj) { @@ -190,10 +182,6 @@ public class Version implements Comparable { && this.build == that.build; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -205,10 +193,6 @@ public class Version implements Comparable { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/src/main/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolver.java index f87a1351e..756f67848 100644 --- a/src/main/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolver.java @@ -96,10 +96,6 @@ public class HateoasPageableHandlerMethodArgumentResolver extends PageableHandle return pagingVariables.concat(sortResolver.getSortTemplateVariables(parameter, template)); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.mvc.UriComponentsContributor#enhance(org.springframework.web.util.UriComponentsBuilder, org.springframework.core.MethodParameter, java.lang.Object) - */ @Override public void enhance(UriComponentsBuilder builder, @Nullable MethodParameter parameter, Object value) { diff --git a/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java index 9fbcbf546..9f8009bdc 100644 --- a/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java @@ -60,10 +60,6 @@ public class HateoasSortHandlerMethodArgumentResolver extends SortHandlerMethodA return new TemplateVariables(new TemplateVariable(sortParameter, type, description)); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.mvc.UriComponentsContributor#enhance(org.springframework.web.util.UriComponentsBuilder, org.springframework.core.MethodParameter, java.lang.Object) - */ @Override public void enhance(UriComponentsBuilder builder, @Nullable MethodParameter parameter, @Nullable Object value) { diff --git a/src/main/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactory.java b/src/main/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactory.java index ed71e5ca5..036c8eda1 100644 --- a/src/main/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactory.java +++ b/src/main/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactory.java @@ -95,10 +95,6 @@ public class JsonProjectingMethodInterceptorFactory implements MethodInterceptor this.context = JsonPath.using(configuration); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.MethodInterceptorFactory#createMethodInterceptor(java.lang.Object, java.lang.Class) - */ @Override public MethodInterceptor createMethodInterceptor(Object source, Class targetType) { @@ -108,10 +104,6 @@ public class JsonProjectingMethodInterceptorFactory implements MethodInterceptor return new InputMessageProjecting(context); } - /* - * (non-Javadoc) - * @see org.springframework.data.projection.MethodInterceptorFactory#supports(java.lang.Object, java.lang.Class) - */ @Override public boolean supports(Object source, Class targetType) { @@ -148,10 +140,6 @@ public class JsonProjectingMethodInterceptorFactory implements MethodInterceptor this.context = context; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(MethodInvocation invocation) throws Throwable { @@ -223,10 +211,6 @@ public class JsonProjectingMethodInterceptorFactory implements MethodInterceptor this.type = type; } - /* - * (non-Javadoc) - * @see com.jayway.jsonpath.TypeRef#getType() - */ @Override public Type getType() { return type.getType(); diff --git a/src/main/java/org/springframework/data/web/MapDataBinder.java b/src/main/java/org/springframework/data/web/MapDataBinder.java index b23f04ddc..c72322d55 100644 --- a/src/main/java/org/springframework/data/web/MapDataBinder.java +++ b/src/main/java/org/springframework/data/web/MapDataBinder.java @@ -69,10 +69,6 @@ class MapDataBinder extends WebDataBinder { this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.validation.DataBinder#getTarget() - */ @NonNull @Override @SuppressWarnings("unchecked") @@ -87,10 +83,6 @@ class MapDataBinder extends WebDataBinder { return (Map) target; } - /* - * (non-Javadoc) - * @see org.springframework.validation.DataBinder#getPropertyAccessor() - */ @Override protected ConfigurablePropertyAccessor getPropertyAccessor() { return new MapPropertyAccessor(type, getTarget(), conversionService); @@ -119,19 +111,11 @@ class MapDataBinder extends WebDataBinder { this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.beans.PropertyAccessor#isReadableProperty(java.lang.String) - */ @Override public boolean isReadableProperty(String propertyName) { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.PropertyAccessor#isWritableProperty(java.lang.String) - */ @Override public boolean isWritableProperty(String propertyName) { @@ -142,30 +126,18 @@ class MapDataBinder extends WebDataBinder { } } - /* - * (non-Javadoc) - * @see org.springframework.beans.PropertyAccessor#getPropertyTypeDescriptor(java.lang.String) - */ @Nullable @Override public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws BeansException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.AbstractPropertyAccessor#getPropertyValue(java.lang.String) - */ @Nullable @Override public Object getPropertyValue(String propertyName) throws BeansException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.AbstractPropertyAccessor#setPropertyValue(java.lang.String, java.lang.Object) - */ @Override public void setPropertyValue(String propertyName, @Nullable Object value) throws BeansException { @@ -257,19 +229,11 @@ class MapDataBinder extends WebDataBinder { this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.context.expression.MapAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) - */ @Override public boolean canRead(EvaluationContext context, @Nullable Object target, String name) throws AccessException { return true; } - /* - * (non-Javadoc) - * @see org.springframework.context.expression.MapAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) - */ @Override @SuppressWarnings("unchecked") public TypedValue read(EvaluationContext context, @Nullable Object target, String name) throws AccessException { diff --git a/src/main/java/org/springframework/data/web/MethodParameterAwarePagedResourcesAssembler.java b/src/main/java/org/springframework/data/web/MethodParameterAwarePagedResourcesAssembler.java index 08e22ab07..cf3afe477 100644 --- a/src/main/java/org/springframework/data/web/MethodParameterAwarePagedResourcesAssembler.java +++ b/src/main/java/org/springframework/data/web/MethodParameterAwarePagedResourcesAssembler.java @@ -48,10 +48,6 @@ class MethodParameterAwarePagedResourcesAssembler extends PagedResourcesAssem this.parameter = parameter; } - /* - * (non-Javadoc) - * @see org.springframework.data.web.PagedResourcesAssembler#getMethodParameter() - */ @NonNull @Override protected MethodParameter getMethodParameter() { diff --git a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java index f4702fc52..35bdbfb76 100644 --- a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java @@ -66,19 +66,11 @@ public class PageableHandlerMethodArgumentResolver extends PageableHandlerMethod this.sortResolver = sortResolver == null ? DEFAULT_SORT_RESOLVER : sortResolver; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return Pageable.class.equals(parameter.getParameterType()); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory) - */ @Override public Pageable resolveArgument(MethodParameter methodParameter, @Nullable ModelAndViewContainer mavContainer, NativeWebRequest webRequest, @Nullable WebDataBinderFactory binderFactory) { diff --git a/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java b/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java index 4f0fefc4f..c04ea5bcd 100644 --- a/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java +++ b/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java @@ -86,10 +86,6 @@ public class PagedResourcesAssembler implements RepresentationModelAssembler< this.forceFirstAndLastRels = forceFirstAndLastRels; } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.RepresentationModelAssembler#toModel(java.lang.Object) - */ @Override public PagedModel> toModel(Page entity) { return toModel(entity, EntityModel::of); diff --git a/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java b/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java index 6c23158f2..81912ac09 100644 --- a/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java @@ -58,19 +58,11 @@ public class PagedResourcesAssemblerArgumentResolver implements HandlerMethodArg this.resolver = resolver; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return PagedResourcesAssembler.class.equals(parameter.getParameterType()); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory) - */ @NonNull @Override public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewContainer mavContainer, diff --git a/src/main/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverter.java b/src/main/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverter.java index 183f7c26d..5b137e010 100644 --- a/src/main/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverter.java +++ b/src/main/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverter.java @@ -91,28 +91,16 @@ public class ProjectingJackson2HttpMessageConverter extends MappingJackson2HttpM return projectionFactory; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { projectionFactory.setBeanClassLoader(classLoader); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { projectionFactory.setBeanFactory(beanFactory); } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter#canRead(java.lang.reflect.Type, java.lang.Class, org.springframework.http.MediaType) - */ @Override public boolean canRead(Type type, @Nullable Class contextClass, @Nullable MediaType mediaType) { @@ -134,19 +122,11 @@ public class ProjectingJackson2HttpMessageConverter extends MappingJackson2HttpM return result; } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter#canWrite(java.lang.Class, org.springframework.http.MediaType) - */ @Override public boolean canWrite(Class clazz, @Nullable MediaType mediaType) { return false; } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter#read(java.lang.reflect.Type, java.lang.Class, org.springframework.http.HttpInputMessage) - */ @Override public Object read(Type type, @Nullable Class contextClass, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { diff --git a/src/main/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolver.java index d861dfd0e..23451b976 100644 --- a/src/main/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolver.java @@ -63,28 +63,16 @@ public class ProxyingHandlerMethodArgumentResolver extends ModelAttributeMethodP this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.proxyFactory.setBeanFactory(beanFactory); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.proxyFactory.setBeanClassLoader(classLoader); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { @@ -114,10 +102,6 @@ public class ProxyingHandlerMethodArgumentResolver extends ModelAttributeMethodP return !IGNORED_PACKAGES.stream().anyMatch(it -> packageName.startsWith(it)); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.annotation.ModelAttributeMethodProcessor#createAttribute(java.lang.String, org.springframework.core.MethodParameter, org.springframework.web.bind.support.WebDataBinderFactory, org.springframework.web.context.request.NativeWebRequest) - */ @Override protected Object createAttribute(String attributeName, MethodParameter parameter, WebDataBinderFactory binderFactory, NativeWebRequest request) throws Exception { @@ -128,10 +112,6 @@ public class ProxyingHandlerMethodArgumentResolver extends ModelAttributeMethodP return proxyFactory.createProjection(parameter.getParameterType(), binder.getTarget()); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.annotation.ModelAttributeMethodProcessor#bindRequestParameters(org.springframework.web.bind.WebDataBinder, org.springframework.web.context.request.NativeWebRequest) - */ @Override protected void bindRequestParameters(WebDataBinder binder, NativeWebRequest request) {} } diff --git a/src/main/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolver.java index 58bd06e64..51844cff5 100644 --- a/src/main/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolver.java @@ -58,19 +58,11 @@ public class ReactivePageableHandlerMethodArgumentResolver extends PageableHandl this.sortResolver = sortResolver; } - /* - * (non-Javadoc) - * @see org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return Pageable.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 Pageable resolveArgumentValue(MethodParameter parameter, BindingContext bindingContext, diff --git a/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java index c54b5f717..323b7748a 100644 --- a/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolver.java @@ -34,10 +34,6 @@ import org.springframework.web.server.ServerWebExchange; public class ReactiveSortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolverSupport implements SyncHandlerMethodArgumentResolver { - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return Sort.class.equals(parameter.getParameterType()); diff --git a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java index c3b5f7461..353ced65f 100644 --- a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java @@ -40,19 +40,11 @@ import org.springframework.web.method.support.ModelAndViewContainer; public class SortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolverSupport implements SortArgumentResolver { - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return Sort.class.equals(parameter.getParameterType()); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory) - */ @Override public Sort resolveArgument(MethodParameter parameter, @Nullable ModelAndViewContainer mavContainer, NativeWebRequest webRequest, @Nullable WebDataBinderFactory binderFactory) { diff --git a/src/main/java/org/springframework/data/web/XmlBeamHttpMessageConverter.java b/src/main/java/org/springframework/data/web/XmlBeamHttpMessageConverter.java index c9f5b459e..30169a2ec 100644 --- a/src/main/java/org/springframework/data/web/XmlBeamHttpMessageConverter.java +++ b/src/main/java/org/springframework/data/web/XmlBeamHttpMessageConverter.java @@ -59,10 +59,6 @@ public class XmlBeamHttpMessageConverter extends AbstractHttpMessageConverter type) { @@ -111,19 +103,11 @@ public class XmlBeamHttpMessageConverter extends AbstractHttpMessageConverter clazz, @Nullable MediaType mediaType) { return false; } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.AbstractHttpMessageConverter#readInternal(java.lang.Class, org.springframework.http.HttpInputMessage) - */ @Override protected Object readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { @@ -144,10 +128,6 @@ public class XmlBeamHttpMessageConverter extends AbstractHttpMessageConverter resourceLoader = Optional.empty(); - /* - * (non-Javadoc) - * @see org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader) - */ @Override public void setResourceLoader(ResourceLoader resourceLoader) { this.resourceLoader = Optional.of(resourceLoader).map(ResourceLoader::getClassLoader); } - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ImportSelector#selectImports(org.springframework.core.type.AnnotationMetadata) - */ @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { @@ -129,10 +121,6 @@ public @interface EnableSpringDataWebSupport { */ static class QuerydslActivator implements ImportSelector { - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ImportSelector#selectImports(org.springframework.core.type.AnnotationMetadata) - */ @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { return QuerydslUtils.QUERY_DSL_PRESENT ? new String[] { QuerydslWebConfiguration.class.getName() } diff --git a/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java b/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java index f30a70ab5..15a3d8b4d 100644 --- a/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java @@ -65,10 +65,6 @@ public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfigu PagedResourcesAssemblerArgumentResolver.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.web.config.SpringDataWebConfiguration#pageableResolver() - */ @Override @Bean public HateoasPageableHandlerMethodArgumentResolver pageableResolver() { @@ -79,10 +75,6 @@ public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfigu return pageableResolver; } - /* - * (non-Javadoc) - * @see org.springframework.data.web.config.SpringDataWebConfiguration#sortResolver() - */ @Bean @Override public HateoasSortHandlerMethodArgumentResolver sortResolver() { @@ -102,10 +94,6 @@ public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfigu return new PagedResourcesAssemblerArgumentResolver(pageableResolver.get()); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport#addArgumentResolvers(java.util.List) - */ @Override public void addArgumentResolvers(List argumentResolvers) { diff --git a/src/main/java/org/springframework/data/web/config/ProjectingArgumentResolverRegistrar.java b/src/main/java/org/springframework/data/web/config/ProjectingArgumentResolverRegistrar.java index d8d4d5868..f2f689e56 100644 --- a/src/main/java/org/springframework/data/web/config/ProjectingArgumentResolverRegistrar.java +++ b/src/main/java/org/springframework/data/web/config/ProjectingArgumentResolverRegistrar.java @@ -82,38 +82,22 @@ public class ProjectingArgumentResolverRegistrar { this.resolver = new ProxyingHandlerMethodArgumentResolver(conversionService, false); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) - */ @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.resolver.setBeanFactory(beanFactory); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.resolver.setBeanClassLoader(classLoader); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, java.lang.String) - */ @Nullable @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String) - */ @Nullable @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { diff --git a/src/main/java/org/springframework/data/web/config/QuerydslWebConfiguration.java b/src/main/java/org/springframework/data/web/config/QuerydslWebConfiguration.java index d5c6230e2..eea52b7f5 100644 --- a/src/main/java/org/springframework/data/web/config/QuerydslWebConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/QuerydslWebConfiguration.java @@ -71,10 +71,6 @@ public class QuerydslWebConfiguration implements WebMvcConfigurer { return new QuerydslBindingsFactory(resolver.getIfUnique(() -> SimpleEntityPathResolver.INSTANCE)); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter#addArgumentResolvers(java.util.List) - */ @Override public void addArgumentResolvers(List argumentResolvers) { argumentResolvers.add(0, diff --git a/src/main/java/org/springframework/data/web/config/ReactiveQuerydslWebConfiguration.java b/src/main/java/org/springframework/data/web/config/ReactiveQuerydslWebConfiguration.java index f952341cd..fd7472b95 100644 --- a/src/main/java/org/springframework/data/web/config/ReactiveQuerydslWebConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/ReactiveQuerydslWebConfiguration.java @@ -67,10 +67,6 @@ public class ReactiveQuerydslWebConfiguration implements WebFluxConfigurer { return new QuerydslBindingsFactory(resolver.getIfUnique(() -> SimpleEntityPathResolver.INSTANCE)); } - /* - * (non-Javadoc) - * @see org.springframework.web.reactive.config.WebFluxConfigurer#configureArgumentResolvers(org.springframework.web.reactive.result.method.annotation.ArgumentResolverConfigurer) - */ @Override public void configureArgumentResolvers(ArgumentResolverConfigurer configurer) { configurer.addCustomResolver( diff --git a/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java b/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java index 3c5bdb64c..e70c69b43 100644 --- a/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java @@ -85,19 +85,11 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo () -> context.getBeanProvider(SortHandlerMethodArgumentResolverCustomizer.class).getIfAvailable()); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; } - /* - * (non-Javadoc) - * @see org.springframework.data.web.config.SpringDataWebConfiguration#pageableResolver() - */ @Bean public PageableHandlerMethodArgumentResolver pageableResolver() { @@ -107,10 +99,6 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo return pageableResolver; } - /* - * (non-Javadoc) - * @see org.springframework.data.web.config.SpringDataWebConfiguration#sortResolver() - */ @Bean public SortHandlerMethodArgumentResolver sortResolver() { @@ -119,10 +107,6 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo return sortResolver; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter#addFormatters(org.springframework.format.FormatterRegistry) - */ @Override public void addFormatters(FormatterRegistry registry) { @@ -137,10 +121,6 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo converter.setApplicationContext(context); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter#addArgumentResolvers(java.util.List) - */ @Override public void addArgumentResolvers(List argumentResolvers) { @@ -154,10 +134,6 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo argumentResolvers.add(resolver); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter#extendMessageConverters(java.util.List) - */ @Override public void extendMessageConverters(List> converters) { diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java index 1b9e10527..402d27134 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java @@ -66,10 +66,6 @@ public class QuerydslPredicateArgumentResolver extends QuerydslPredicateArgument super(factory, conversionService); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory) - */ @Nullable @Override public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewContainer mavContainer, diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverSupport.java b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverSupport.java index bc1709eb8..7ac01ab14 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverSupport.java +++ b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverSupport.java @@ -70,10 +70,6 @@ public abstract class QuerydslPredicateArgumentResolverSupport { this.predicateBuilder = new QuerydslPredicateBuilder(conversionService, factory.getEntityPathResolver()); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ public boolean supportsParameter(MethodParameter parameter) { var type = ResolvableType.forMethodParameter(parameter); diff --git a/src/main/java/org/springframework/data/web/querydsl/ReactiveQuerydslPredicateArgumentResolver.java b/src/main/java/org/springframework/data/web/querydsl/ReactiveQuerydslPredicateArgumentResolver.java index 6c71104ed..76e696647 100644 --- a/src/main/java/org/springframework/data/web/querydsl/ReactiveQuerydslPredicateArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/querydsl/ReactiveQuerydslPredicateArgumentResolver.java @@ -42,10 +42,6 @@ public class ReactiveQuerydslPredicateArgumentResolver extends QuerydslPredicate super(factory, conversionService); } - /* - * (non-Javadoc) - * @see org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentResolver(org.springframework.core.MethodParameter, org.springframework.web.reactive.BindingContext, org.springframework.web.server.ServerWebExchange) - */ @Override @Nullable public Object resolveArgumentValue(MethodParameter parameter, BindingContext bindingContext, diff --git a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java index 0de8cbf5e..c18c8d1c7 100755 --- a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java @@ -109,10 +109,6 @@ class AuditingBeanDefinitionRegistrarSupportUnitTests { }; } - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName() - */ @Override protected String getAuditingHandlerBeanName() { return "auditingHandler"; diff --git a/src/test/java/org/springframework/data/classloadersupport/HidingClassLoader.java b/src/test/java/org/springframework/data/classloadersupport/HidingClassLoader.java index 66b691f5c..7736b6d23 100644 --- a/src/test/java/org/springframework/data/classloadersupport/HidingClassLoader.java +++ b/src/test/java/org/springframework/data/classloadersupport/HidingClassLoader.java @@ -61,10 +61,6 @@ public class HidingClassLoader extends ShadowingClassLoader { .collect(Collectors.toList())); } - /* - * (non-Javadoc) - * @see org.springframework.data.classloadersupport.ShadowingClassLoader#loadClass(java.lang.String) - */ @Override public Class loadClass(String name) throws ClassNotFoundException { @@ -72,19 +68,11 @@ public class HidingClassLoader extends ShadowingClassLoader { return super.loadClass(name); } - /* - * (non-Javadoc) - * @see org.springframework.data.classloadersupport.ShadowingClassLoader#isEligibleForShadowing(java.lang.String) - */ @Override protected boolean isEligibleForShadowing(String className) { return isExcluded(className); } - /* - * (non-Javadoc) - * @see java.lang.ClassLoader#findClass(java.lang.String) - */ @Override protected Class findClass(String name) throws ClassNotFoundException { diff --git a/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java b/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java index 413d3f3fa..22477ec6c 100755 --- a/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java @@ -31,10 +31,6 @@ import org.springframework.data.domain.Sort.Direction; */ class PageRequestUnitTests extends AbstractPageRequestUnitTests { - /* - * (non-Javadoc) - * @see org.springframework.data.domain.AbstractPageRequestUnitTests#newPageRequest(int, int) - */ @Override public AbstractPageRequest newPageRequest(int page, int size) { return PageRequest.of(page, size); 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 b646a1dfe..a6ac5eb69 100755 --- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java @@ -432,10 +432,6 @@ class AbstractMappingContextUnitTests { return new TypeRejectingMappingContext(exception, Arrays.asList(types)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.SampleMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation) - */ @Override protected BasicPersistentEntity createPersistentEntity( TypeInformation typeInformation) { diff --git a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java index b14fbb675..a54851bad 100755 --- a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java @@ -430,19 +430,11 @@ class BasicPersistentEntityUnitTests> { private final Long id = 42L; - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Persistable#getId() - */ @Override public Long getId() { return 4711L; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Persistable#isNew() - */ @Override public boolean isNew() { return false; diff --git a/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java index 082caa7c8..4961fe0b8 100644 --- a/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java @@ -151,19 +151,11 @@ class PersistentEntityIsNewStrategyUnitTests { boolean isNew; - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Persistable#isNew() - */ @Override public boolean isNew() { return isNew; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.Persistable#getId() - */ @Override public Long getId() { return null; diff --git a/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java b/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java index 840ba3edc..8ae21160e 100755 --- a/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java @@ -30,10 +30,6 @@ import org.springframework.data.domain.AbstractPageRequestUnitTests; */ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests { - /* - * (non-Javadoc) - * @see org.springframework.data.domain.AbstractPageRequestUnitTests#newPageRequest(int, int) - */ @Override public AbstractPageRequest newPageRequest(int page, int size) { return QPageRequest.of(page, size); diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java index 5bd30d4f5..c8d1dca4b 100755 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java @@ -290,10 +290,6 @@ class QuerydslBindingsUnitTests { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.SingleValueBinding#bind(com.querydsl.core.types.Path, java.lang.Object) - */ @Override public Predicate bind(StringPath path, String value) { return path.contains(value); diff --git a/src/test/java/org/springframework/data/repository/config/ExcludedRepositoryImpl.java b/src/test/java/org/springframework/data/repository/config/ExcludedRepositoryImpl.java index 02bb64ab9..c20c8f64e 100644 --- a/src/test/java/org/springframework/data/repository/config/ExcludedRepositoryImpl.java +++ b/src/test/java/org/springframework/data/repository/config/ExcludedRepositoryImpl.java @@ -20,10 +20,6 @@ package org.springframework.data.repository.config; */ public class ExcludedRepositoryImpl implements ExcludedRepository { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.ExcludedRepository#getImplementationId() - */ @Override public String getImplementationId() { return getClass().getName(); diff --git a/src/test/java/org/springframework/data/repository/config/MyOtherRepositoryImpl.java b/src/test/java/org/springframework/data/repository/config/MyOtherRepositoryImpl.java index cb295285f..5178b06f2 100644 --- a/src/test/java/org/springframework/data/repository/config/MyOtherRepositoryImpl.java +++ b/src/test/java/org/springframework/data/repository/config/MyOtherRepositoryImpl.java @@ -17,10 +17,6 @@ package org.springframework.data.repository.config; public class MyOtherRepositoryImpl implements MyOtherRepositoryExtensions { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.MyOtherRepositoryExtensions#getImplementationId() - */ @Override public String getImplementationId() { return getClass().getName(); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java index 7f440f017..ec52400fa 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java @@ -159,19 +159,11 @@ class RepositoryBeanDefinitionRegistrarSupportUnitTests { setResourceLoader(new DefaultResourceLoader()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableRepositories.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension() - */ @Override protected RepositoryConfigurationExtension getExtension() { return new DummyConfigurationExtension(); diff --git a/src/test/java/org/springframework/data/repository/core/support/DummyEntityInformation.java b/src/test/java/org/springframework/data/repository/core/support/DummyEntityInformation.java index 459470fcd..969166b68 100644 --- a/src/test/java/org/springframework/data/repository/core/support/DummyEntityInformation.java +++ b/src/test/java/org/springframework/data/repository/core/support/DummyEntityInformation.java @@ -33,18 +33,10 @@ public class DummyEntityInformation extends AbstractEntityInformation getIdType() { return Serializable.class; } diff --git a/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java b/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java index ad986e2ee..cacec6eee 100644 --- a/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java +++ b/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java @@ -54,48 +54,28 @@ public class DummyReactiveRepositoryFactory extends ReactiveRepositoryFactorySup Mockito.any(ProjectionFactory.class), Mockito.any(NamedQueries.class))).thenReturn(queryOne); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public EntityInformation getEntityInformation(Class domainClass) { return mock(EntityInformation.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Object getTargetRepository(RepositoryInformation information) { return repository; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { return repository.getClass(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider) - */ @Override protected Optional getQueryLookupStrategy(Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) { return Optional.of(strategy); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected RepositoryComposition.RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) { diff --git a/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactory.java b/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactory.java index 2a55bcc83..d472b767b 100644 --- a/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactory.java +++ b/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactory.java @@ -75,48 +75,28 @@ public class DummyRepositoryFactory extends RepositoryFactorySupport { setBeanFactory(beanFactory); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public EntityInformation getEntityInformation(Class domainClass) { return mock(EntityInformation.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Object getTargetRepository(RepositoryInformation information) { return repository; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { return repository.getClass(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider) - */ @Override protected Optional getQueryLookupStrategy(Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) { return Optional.of(strategy); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) { diff --git a/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java b/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java index 7754ef1b0..962eb99f9 100644 --- a/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java +++ b/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java @@ -38,10 +38,6 @@ public class DummyRepositoryFactoryBean, S, ID exten setMappingContext(new SampleMappingContext()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createRepositoryFactory() - */ @Override protected RepositoryFactorySupport createRepositoryFactory() { return new DummyRepositoryFactory(repository); diff --git a/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java index 7531374ab..d3241bce8 100644 --- a/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java @@ -55,10 +55,6 @@ class SurroundingTransactionDetectorMethodInterceptorUnitTests { this.transactionActive = expectTransactionActive; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.Joinpoint#proceed() - */ public Object proceed() throws Throwable { assertThat(INSTANCE.isSurroundingTransactionActive()).isEqualTo(transactionActive); diff --git a/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java b/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java index 9ac3d7775..768c2a0ef 100755 --- a/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java @@ -330,19 +330,11 @@ class ExtensionAwareEvaluationContextProviderUnitTests { private final String key, value; - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.spi.EvaluationContextExtension#getExtensionId() - */ @Override public String getExtensionId() { return key; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.EvaluationContextExtensionAdapter#getProperties() - */ @Override public Map getProperties() { @@ -353,10 +345,6 @@ class ExtensionAwareEvaluationContextProviderUnitTests { return properties; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.spi.EvaluationContextExtensionSupport#getFunctions() - */ @Override public Map getFunctions() { diff --git a/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java b/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java index b04fa7b16..11c72db09 100755 --- a/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java @@ -308,19 +308,11 @@ class RepositoriesUnitTests { } } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.DefaultRepositoryMetadata#getDomainType() - */ @Override public Class getDomainType() { return this.domainType; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.AbstractRepositoryMetadata#getAlternativeDomainTypes() - */ @Override public Set> getAlternativeDomainTypes() { return Collections.singleton(super.getDomainType()); diff --git a/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java b/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java index a801879e7..f8e99e847 100644 --- a/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java @@ -65,10 +65,6 @@ public class ProxyUtilsUnitTests { static class SampleProxyDetector implements ProxyDetector { - /* - * (non-Javadoc) - * @see org.springframework.data.util.ProxyUtils.ProxyDetector#getUserType(java.lang.Class) - */ @Override public Class getUserType(Class type) { return AnotherSample.class.isAssignableFrom(type) ? UserType.class : type; diff --git a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java index 2e537542e..940bebe09 100755 --- a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java +++ b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java @@ -295,10 +295,6 @@ class PagedResourcesAssemblerUnitTests { static class PersonResourceAssembler implements RepresentationModelAssembler { - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.RepresentationModelAssembler#toModel(java.lang.Object) - */ @Override public PersonResource toModel(Person entity) { var resource = new PersonResource(); @@ -313,10 +309,6 @@ class PagedResourcesAssemblerUnitTests { super(resolver, baseUri); } - /* - * (non-Javadoc) - * @see org.springframework.data.web.PagedResourcesAssembler#createPagedModel(java.util.List, org.springframework.hateoas.PagedModel.PageMetadata, org.springframework.data.domain.Page) - */ @Override protected , S> PagedModel createPagedModel(List resources, PageMetadata metadata, Page page) {