From ee317f1b913d1b2b13278af9ae3a9b2c34d11747 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 5 Jan 2022 13:39:47 +0100 Subject: [PATCH] Remove Eclipse Non-Javadoc comments. Closes #2093 --- .../springframework/data/rest/core/Path.java | 12 ---- .../rest/core/StringToLdapNameConverter.java | 4 -- .../data/rest/core/UriToEntityConverter.java | 12 ---- .../data/rest/core/ValidationErrors.java | 8 --- .../config/EntityLookupConfiguration.java | 53 --------------- .../rest/core/config/JsonSchemaFormat.java | 4 -- .../ProjectionDefinitionConfiguration.java | 24 ------- .../AbstractRepositoryEventListener.java | 4 -- .../event/AnnotatedEventHandlerInvoker.java | 28 -------- .../ValidatingRepositoryEventListener.java | 32 ---------- .../AnnotationBasedResourceDescription.java | 12 ---- .../core/mapping/ConfigurableHttpMethods.java | 8 --- ...onApplyingSupportedHttpMethodsAdapter.java | 12 ---- .../CrudMethodsSupportedHttpMethods.java | 24 ------- ...torTypeBasedCollectionResourceMapping.java | 4 -- .../core/mapping/ExposureConfiguration.java | 32 ---------- .../core/mapping/MappingResourceMetadata.java | 36 ----------- .../rest/core/mapping/ParameterMetadata.java | 8 --- .../rest/core/mapping/ParametersMetadata.java | 4 -- .../PersistentEntitiesResourceMappings.java | 28 -------- .../PersistentPropertyResourceMapping.java | 24 ------- .../RepositoryAwareResourceMetadata.java | 56 ---------------- .../RepositoryCollectionResourceMapping.java | 32 ---------- .../RepositoryMethodResourceMapping.java | 36 ----------- .../mapping/RepositoryResourceMappings.java | 12 ---- .../ResolvableResourceDescriptionSupport.java | 8 --- .../core/mapping/SearchResourceMappings.java | 24 ------- .../mapping/SimpleResourceDescription.java | 16 ----- .../core/mapping/SupportedHttpMethods.java | 12 ---- .../TypeBasedCollectionResourceMapping.java | 32 ---------- .../mapping/TypedResourceDescription.java | 8 --- .../core/support/DefaultSelfLinkProvider.java | 8 --- .../core/support/EntityLookupSupport.java | 4 -- .../core/support/RepositoryRelProvider.java | 12 ---- .../rest/core/support/SimpleRelProvider.java | 12 ---- .../UnwrappingRepositoryInvokerFactory.java | 44 ------------- .../rest/core/domain/OrderRepository.java | 8 --- .../core/domain/PersonBeforeSaveHandler.java | 4 -- ...AnnotatedEventHandlerInvokerUnitTests.java | 4 -- .../halexplorer/HalExplorerConfiguration.java | 4 -- .../data/rest/tests/ResourceTester.java | 4 -- .../data/rest/tests/TestMatchers.java | 12 ---- .../tests/geode/AbstractPersistentEntity.java | 8 --- .../data/rest/tests/geode/EmailAddress.java | 20 ------ .../data/rest/tests/geode/GeodeWebTests.java | 4 -- .../data/rest/webmvc/jpa/BookIdConverter.java | 12 ---- .../data/rest/webmvc/jpa/JpaWebTests.java | 20 ------ .../rest/tests/mongodb/UserRepository.java | 4 -- .../mongodb/MongoDbRepositoryConfig.java | 12 ---- .../rest/tests/mongodb/MongoWebTests.java | 4 -- .../data/rest/tests/shop/Address.java | 4 -- .../rest/tests/shop/ShopConfiguration.java | 8 --- .../webmvc/BasePathAwareHandlerMapping.java | 20 ------ .../rest/webmvc/PersistentEntityResource.java | 4 -- .../PersistentEntityResourceAssembler.java | 4 -- .../webmvc/RepositoryEntityController.java | 4 -- ...RepositoryPropertyReferenceController.java | 8 --- .../webmvc/RepositoryRestHandlerAdapter.java | 12 ---- .../webmvc/RepositoryRestHandlerMapping.java | 31 --------- .../alps/AlpsJsonHttpMessageConverter.java | 20 ------ ...eInformationToAlpsDescriptorConverter.java | 4 -- ...lverPagingAndSortingTemplateVariables.java | 16 ----- .../config/DelegatingHandlerMapping.java | 40 ------------ .../HalFormsAdaptingResponseBodyAdvice.java | 8 --- .../webmvc/config/JMoleculesConfigurer.java | 20 ------ ...tityResourceAssemblerArgumentResolver.java | 8 --- ...ResourceHandlerMethodArgumentResolver.java | 8 --- .../config/ProjectionDefinitionRegistar.java | 4 -- ...ormationHandlerMethodArgumentResolver.java | 4 -- .../webmvc/config/RepositoryCorsRegistry.java | 3 - .../config/RepositoryRestConfigurer.java | 8 --- .../RepositoryRestConfigurerDelegate.java | 32 ---------- .../RepositoryRestMvcConfiguration.java | 24 ------- ...MetadataHandlerMethodArgumentResolver.java | 8 --- .../config/RestControllerImportSelector.java | 4 -- ...ormationHandlerMethodArgumentResolver.java | 8 --- .../WebMvcRepositoryRestConfiguration.java | 4 -- .../convert/UriListHttpMessageConverter.java | 20 ------ .../AggregateReferenceResolvingModule.java | 4 -- .../rest/webmvc/json/DomainObjectReader.java | 8 --- .../data/rest/webmvc/json/EnumTranslator.java | 16 ----- .../rest/webmvc/json/JacksonMetadata.java | 4 -- .../rest/webmvc/json/JacksonSerializers.java | 16 ----- ...wareDefaultedPageableArgumentResolver.java | 8 --- .../MappingAwarePageableArgumentResolver.java | 8 --- .../MappingAwareSortArgumentResolver.java | 8 --- .../json/PersistentEntityJackson2Module.java | 64 ------------------- ...PersistentEntityToJsonSchemaConverter.java | 28 -------- .../rest/webmvc/json/patch/AddOperation.java | 8 --- .../rest/webmvc/json/patch/CopyOperation.java | 4 -- .../json/patch/JsonLateObjectEvaluator.java | 4 -- .../rest/webmvc/json/patch/MoveOperation.java | 4 -- .../data/rest/webmvc/json/patch/Patch.java | 4 -- .../webmvc/json/patch/RemoveOperation.java | 4 -- .../webmvc/json/patch/ReplaceOperation.java | 4 -- .../data/rest/webmvc/json/patch/SpelPath.java | 60 ----------------- .../rest/webmvc/json/patch/TestOperation.java | 4 -- .../webmvc/mapping/DefaultLinkCollector.java | 8 --- .../rest/webmvc/spi/BackendIdConverter.java | 12 ---- ...ackendIdHandlerMethodArgumentResolver.java | 8 --- .../support/DefaultExcerptProjector.java | 8 --- .../webmvc/support/DefaultedPageable.java | 12 ---- ...PageableHandlerMethodArgumentResolver.java | 8 --- .../data/rest/webmvc/support/ETag.java | 12 ---- .../webmvc/support/ETagArgumentResolver.java | 8 --- ...tpMethodHandlerMethodArgumentResolver.java | 8 --- .../support/PersistentEntityProjector.java | 8 --- ...ryConstraintViolationExceptionMessage.java | 12 ---- .../webmvc/support/RepositoryEntityLinks.java | 24 ------- .../webmvc/support/RepositoryLinkBuilder.java | 12 ---- .../util/InputStreamHttpInputMessage.java | 8 --- ...RepositoryRestHandlerMappingUnitTests.java | 4 -- .../RootResourceInformationUnitTests.java | 4 -- .../json/DomainObjectReaderUnitTests.java | 4 -- ...rsistentEntityJackson2ModuleUnitTests.java | 4 -- 115 files changed, 1571 deletions(-) diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java index 0fdd4f3c7..7f9aeee0f 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java @@ -75,10 +75,6 @@ public class Path { return slash(path.toString()); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return path.hashCode(); @@ -101,19 +97,11 @@ public class Path { return trimmed.contains("://") ? trimmed : SLASH + trimmed; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return path; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/StringToLdapNameConverter.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/StringToLdapNameConverter.java index 492f267f3..3d0c05704 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/StringToLdapNameConverter.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/StringToLdapNameConverter.java @@ -31,10 +31,6 @@ public enum StringToLdapNameConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public LdapName convert(String source) { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/UriToEntityConverter.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/UriToEntityConverter.java index 39f4faf6a..83f2e5e5b 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/UriToEntityConverter.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/UriToEntityConverter.java @@ -81,29 +81,17 @@ public class UriToEntityConverter implements ConditionalGenericConverter { this.repositories = repositories; } - /* - * (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 !sourceType.equals(URI_TYPE) ? false : repositories.getRepositoryInformationFor(targetType.getType()).isPresent(); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @Override public Set getConvertibleTypes() { return convertiblePairs; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/ValidationErrors.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/ValidationErrors.java index 18b3b59e1..8a563069e 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/ValidationErrors.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/ValidationErrors.java @@ -64,10 +64,6 @@ public class ValidationErrors extends AbstractPropertyBindingResult { this.source = source; } - /* - * (non-Javadoc) - * @see org.springframework.validation.AbstractPropertyBindingResult#getPropertyAccessor() - */ @Override public ConfigurablePropertyAccessor getPropertyAccessor() { @@ -109,10 +105,6 @@ public class ValidationErrors extends AbstractPropertyBindingResult { }; } - /* - * (non-Javadoc) - * @see org.springframework.validation.AbstractBindingResult#getTarget() - */ @Override public Object getTarget() { return source; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java index bf320ed95..f33f36498 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java @@ -43,10 +43,6 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { private final List>> lookupInformation = new ArrayList<>(); private final List> lookupTypes = new ArrayList<>(); - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EntityLookupRegistrar#forRepository(java.lang.Class, org.springframework.core.convert.converter.Converter, org.springframework.data.rest.core.config.EntityLookupRegistrar.LookupRegistrar.Lookup) - */ @Override public > EntityLookupRegistrar forRepository(Class repositoryType, Converter converter, Lookup lookup) { @@ -56,10 +52,6 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EntityLookupRegistrar#forValueRepository(java.lang.Class) - */ @Override public > IdMappingRegistrar forLookupRepository(Class type) { @@ -68,19 +60,11 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { return forRepository(type); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EntityLookupRegistrar#forRepository(java.lang.Class) - */ @Override public > IdMappingRegistrar forRepository(Class type) { return new MappingBuilder(type); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EntityLookupRegistrar#forValueRepository(java.lang.Class, org.springframework.core.convert.converter.Converter, org.springframework.data.rest.core.config.EntityLookupRegistrar.LookupRegistrar.Lookup) - */ @Override public > EntityLookupRegistrar forValueRepository(Class type, Converter identifierMapping, Lookup lookup) { @@ -125,10 +109,6 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { this.idMapping = mapping; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EntityLookupRegistrar.LookupRegistrar#withLookup(org.springframework.data.rest.core.config.EntityLookupRegistrar.LookupRegistrar.Lookup) - */ @Override @SuppressWarnings("unchecked") public EntityLookupRegistrar withLookup(Lookup lookup) { @@ -140,10 +120,6 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { return EntityLookupConfiguration.this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EntityLookupRegistrar.IdMappingRegistrar#withIdMapping(org.springframework.core.convert.converter.Converter) - */ @Override public LookupRegistrar withIdMapping(Converter idMapping) { return new MappingBuilder(repositoryType, idMapping); @@ -207,19 +183,11 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { MethodInvocationRecorder.forProxyOf(it).record(lookupInfo.identifierMapping::convert).getPropertyPath()); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.support.EntityLookup#getResourceIdentifier(java.lang.Object) - */ @Override public Object getResourceIdentifier(T entity) { return lookupInfo.getIdentifierMapping().convert(entity); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.support.EntityLookup#lookupEntity(java.io.Serializable) - */ @Override @SuppressWarnings("unchecked") public Optional lookupEntity(Object id) { @@ -229,19 +197,11 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { return Optional.class.isInstance(result) ? (Optional) result : Optional.ofNullable((T) result); } - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(Class delimiter) { return domainType.isAssignableFrom(delimiter); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.support.EntityLookup#getLookupProperty() - */ public Optional getLookupProperty() { return this.lookupProperty; } @@ -277,10 +237,6 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { return this.lookup; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final java.lang.Object o) { @@ -299,20 +255,11 @@ class EntityLookupConfiguration implements EntityLookupRegistrar { && Objects.equals(getLookup(), that.getLookup()); } - /* - * - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(getRepositoryType(), getIdentifierMapping(), getLookup()); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "EntityLookupConfiguration.LookupInformation(repositoryType=" + this.getRepositoryType() diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/JsonSchemaFormat.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/JsonSchemaFormat.java index 187aa4a0a..3ca5ac7b5 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/JsonSchemaFormat.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/JsonSchemaFormat.java @@ -29,10 +29,6 @@ public enum JsonSchemaFormat { EMAIL, DATE_TIME, HOSTNAME, IPV4, IPV6, URI; - /* - * (non-Javadoc) - * @see java.lang.Enum#toString() - */ @JsonValue public String toString() { return name().toLowerCase(Locale.US).replaceAll("_", "-"); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java index e0b6366bd..efdf853c4 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java @@ -47,10 +47,6 @@ public class ProjectionDefinitionConfiguration implements ProjectionDefinitions this.projectionDefinitions = new HashSet<>(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.projection.ProjectionDefinitions#getParameterName() - */ public String getParameterName() { return parameterName; } @@ -128,19 +124,11 @@ public class ProjectionDefinitionConfiguration implements ProjectionDefinitions return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.ProjectionDefinitions#getProjectionType(java.lang.Class, java.lang.String) - */ @Override public Class getProjectionType(Class sourceType, String name) { return getProjectionsFor(sourceType).get(name); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.projection.ProjectionDefinitions#hasProjectionFor(java.lang.Class) - */ @Override public boolean hasProjectionFor(Class sourceType) { @@ -236,10 +224,6 @@ public class ProjectionDefinitionConfiguration implements ProjectionDefinitions return this.name; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -258,19 +242,11 @@ public class ProjectionDefinitionConfiguration implements ProjectionDefinitions && Objects.equals(getName(), that.getName()); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(getSourceType(), getTargetType(), getName()); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "ProjectionDefinitionConfiguration.ProjectionDefinition(sourceType=" + this.getSourceType() diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AbstractRepositoryEventListener.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AbstractRepositoryEventListener.java index 515abf534..8195e4bbb 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AbstractRepositoryEventListener.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AbstractRepositoryEventListener.java @@ -30,10 +30,6 @@ public abstract class AbstractRepositoryEventListener implements ApplicationL private final Class INTERESTED_TYPE = resolveTypeArgument(getClass(), AbstractRepositoryEventListener.class); - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ @Override @SuppressWarnings({ "unchecked" }) public final void onApplicationEvent(RepositoryEvent event) { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java index 40a4ae109..26729bdf7 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java @@ -52,10 +52,6 @@ public class AnnotatedEventHandlerInvoker implements ApplicationListener, EventHandlerMethod> handlerMethods = new LinkedMultiValueMap, EventHandlerMethod>(); - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ @Override public void onApplicationEvent(RepositoryEvent event) { @@ -88,19 +84,11 @@ public class AnnotatedEventHandlerInvoker implements ApplicationListener iterator() { return methods.iterator(); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ConfigurationApplyingSupportedHttpMethodsAdapter.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ConfigurationApplyingSupportedHttpMethodsAdapter.java index 9a6bc0770..4a2754595 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ConfigurationApplyingSupportedHttpMethodsAdapter.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ConfigurationApplyingSupportedHttpMethodsAdapter.java @@ -45,10 +45,6 @@ class ConfigurationApplyingSupportedHttpMethodsAdapter implements SupportedHttpM this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#getMethodsFor(org.springframework.data.rest.core.mapping.ResourceType) - */ @Override public HttpMethods getMethodsFor(ResourceType type) { @@ -57,10 +53,6 @@ class ConfigurationApplyingSupportedHttpMethodsAdapter implements SupportedHttpM return configuration.filter(ConfigurableHttpMethods.of(methods), type, resourceMetadata); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#getMethodsFor(org.springframework.data.mapping.PersistentProperty) - */ @Override public HttpMethods getMethodsFor(PersistentProperty property) { @@ -76,10 +68,6 @@ class ConfigurationApplyingSupportedHttpMethodsAdapter implements SupportedHttpM return configuration.filter(methods, PropertyAwareResourceMapping.class.cast(mapping)); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#allowsPutForCreation() - */ @Override public boolean allowsPutForCreation() { return configuration.allowsPutForCreation(resourceMetadata); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/CrudMethodsSupportedHttpMethods.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/CrudMethodsSupportedHttpMethods.java index 11600cfa4..96ccddcad 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/CrudMethodsSupportedHttpMethods.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/CrudMethodsSupportedHttpMethods.java @@ -55,10 +55,6 @@ public class CrudMethodsSupportedHttpMethods implements SupportedHttpMethods { this.exposedMethods = new DefaultExposureAwareCrudMethods(crudMethods, methodsExposedByDefault); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#getSupportedHttpMethods(org.springframework.data.rest.core.mapping.ResourceType) - */ @Override public HttpMethods getMethodsFor(ResourceType resourceType) { @@ -107,10 +103,6 @@ public class CrudMethodsSupportedHttpMethods implements SupportedHttpMethods { return HttpMethods.of(methods); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#getMethodsFor(org.springframework.data.mapping.PersistentProperty) - */ @Override public HttpMethods getMethodsFor(PersistentProperty property) { @@ -159,37 +151,21 @@ public class CrudMethodsSupportedHttpMethods implements SupportedHttpMethods { this.exportedDefault = exportedDefault; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureAwareCrudMethods#exposesSave() - */ @Override public boolean exposesSave() { return exposesSave.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureAwareCrudMethods#exposesDelete() - */ @Override public boolean exposesDelete() { return exposesDelete.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureAwareCrudMethods#exposesFindOne() - */ @Override public boolean exposesFindOne() { return exposesFindOne.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureAwareCrudMethods#exposesFindAll() - */ @Override public boolean exposesFindAll() { return exposesFindAll.get(); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/EvoInflectorTypeBasedCollectionResourceMapping.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/EvoInflectorTypeBasedCollectionResourceMapping.java index 82b0289a2..728643431 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/EvoInflectorTypeBasedCollectionResourceMapping.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/EvoInflectorTypeBasedCollectionResourceMapping.java @@ -36,10 +36,6 @@ class EvoInflectorTypeBasedCollectionResourceMapping extends TypeBasedCollection super(type, relProvider); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.TypeBasedCollectionResourceMapping#getDefaultPathFor(java.lang.Class) - */ @Override protected String getDefaultPathFor(Class type) { return English.plural(super.getDefaultPathFor(type)); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ExposureConfiguration.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ExposureConfiguration.java index 10ec2345b..601533de8 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ExposureConfiguration.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ExposureConfiguration.java @@ -41,10 +41,6 @@ public class ExposureConfiguration implements ExposureConfigurer { private Function, Boolean> creationViaPut = __ -> true; - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#withCollectionExposure(org.springframework.data.rest.core.mapping.ExposureConfigurer.AggregateResourceHttpMethodsFilter) - */ @Override public ExposureConfiguration withCollectionExposure(AggregateResourceHttpMethodsFilter filter) { @@ -52,10 +48,6 @@ public class ExposureConfiguration implements ExposureConfigurer { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#withItemExposure(org.springframework.data.rest.core.mapping.ExposureConfigurer.AggregateResourceHttpMethodsFilter) - */ @Override public ExposureConfiguration withItemExposure(AggregateResourceHttpMethodsFilter filter) { @@ -63,10 +55,6 @@ public class ExposureConfiguration implements ExposureConfigurer { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#withAssociationExposure(org.springframework.data.rest.core.mapping.ExposureConfigurer.AssociationResourceHttpMethodsFilter) - */ @Override public ExposureConfiguration withAssociationExposure(AssociationResourceHttpMethodsFilter filter) { @@ -74,10 +62,6 @@ public class ExposureConfiguration implements ExposureConfigurer { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#disablePutForCreation() - */ @Override public ExposureConfiguration disablePutForCreation() { @@ -191,10 +175,6 @@ public class ExposureConfiguration implements ExposureConfigurer { this.type = type; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#withCollectionExposure(org.springframework.data.rest.core.mapping.ExposureConfigurer.AggregateResourceHttpMethodsFilter) - */ public ExposureConfigurer withCollectionExposure(AggregateResourceHttpMethodsFilter filter) { ExposureConfiguration config = ExposureConfiguration.this; @@ -203,10 +183,6 @@ public class ExposureConfiguration implements ExposureConfigurer { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#withItemExposure(org.springframework.data.rest.core.mapping.ExposureConfigurer.AggregateResourceHttpMethodsFilter) - */ public ExposureConfigurer withItemExposure(AggregateResourceHttpMethodsFilter filter) { ExposureConfiguration config = ExposureConfiguration.this; @@ -215,10 +191,6 @@ public class ExposureConfiguration implements ExposureConfigurer { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfiguration.ExposureConfigurer#withAssociationExposure(java.util.function.BiFunction) - */ @Override public ExposureConfigurer withAssociationExposure(AssociationResourceHttpMethodsFilter filter) { @@ -233,10 +205,6 @@ public class ExposureConfiguration implements ExposureConfigurer { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ExposureConfigurer#disableCreationViaPut() - */ @Override public ExposureConfigurer disablePutForCreation() { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/MappingResourceMetadata.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/MappingResourceMetadata.java index 94d4b88bb..8aad251c7 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/MappingResourceMetadata.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/MappingResourceMetadata.java @@ -61,64 +61,36 @@ class MappingResourceMetadata extends TypeBasedCollectionResourceMapping impleme .orElse(false); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getDomainType() - */ @Override public Class getDomainType() { return entity.getType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#isExported(org.springframework.data.mapping.PersistentProperty) - */ @Override public boolean isExported(PersistentProperty property) { return getMappingFor(property).isExported(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getMappingFor(org.springframework.data.mapping.PersistentProperty) - */ @Override public ResourceMapping getMappingFor(PersistentProperty property) { return propertyMappings.getMappingFor(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getSearchResourceMappings() - */ @Override public SearchResourceMappings getSearchResourceMappings() { return new SearchResourceMappings(Collections. emptyList()); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getSupportedHttpMethods() - */ @Override public SupportedHttpMethods getSupportedHttpMethods() { return NoSupportedMethods.INSTANCE; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.RootResourceMetadata#getProperty(java.lang.String) - */ @Override public PropertyAwareResourceMapping getProperty(String mappedPath) { return propertyMappings.getMappingFor(mappedPath); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.TypeBasedCollectionResourceMapping#isExported() - */ @Override public boolean isExported() { return explicitlyExported; @@ -148,19 +120,11 @@ class MappingResourceMetadata extends TypeBasedCollectionResourceMapping impleme this.propertyMappings = new HashMap, PropertyAwareResourceMapping>(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.SimpleAssociationHandler#doWithAssociation(org.springframework.data.mapping.Association) - */ @Override public void doWithAssociation(Association> association) { doWithPersistentProperty(association.getInverse()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.SimplePropertyHandler#doWithPersistentProperty(org.springframework.data.mapping.PersistentProperty) - */ @Override public void doWithPersistentProperty(PersistentProperty property) { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java index cfca53289..ad216710d 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java @@ -70,10 +70,6 @@ public final class ParameterMetadata { return description; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -89,10 +85,6 @@ public final class ParameterMetadata { return this.name.equals(that.name) && this.description.equals(that.description); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParametersMetadata.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParametersMetadata.java index a7ababea1..3f5430a12 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParametersMetadata.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParametersMetadata.java @@ -58,10 +58,6 @@ public class ParametersMetadata implements Iterable { return names; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return parameterMetadata.iterator(); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentEntitiesResourceMappings.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentEntitiesResourceMappings.java index b7274132a..f9a126e40 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentEntitiesResourceMappings.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentEntitiesResourceMappings.java @@ -53,10 +53,6 @@ public class PersistentEntitiesResourceMappings implements ResourceMappings { this.entities = entities; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#getMappingFor(java.lang.Class) - */ @Override public ResourceMetadata getMetadataFor(Class type) { @@ -85,19 +81,11 @@ public class PersistentEntitiesResourceMappings implements ResourceMappings { }); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#getSearchResourceMappings(java.lang.Class) - */ @Override public SearchResourceMappings getSearchResourceMappings(Class domainType) { return searchResourceMappings; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#exportsMappingFor(java.lang.Class) - */ @Override public boolean exportsMappingFor(Class type) { @@ -109,10 +97,6 @@ public class PersistentEntitiesResourceMappings implements ResourceMappings { return metadata.isExported(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#exportsTopLevelResourceFor(java.lang.String) - */ @Override public boolean exportsTopLevelResourceFor(String path) { @@ -127,19 +111,11 @@ public class PersistentEntitiesResourceMappings implements ResourceMappings { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#hasMappingFor(java.lang.Class) - */ @Override public boolean hasMappingFor(Class type) { return getMappingMetadataFor(type) != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadataProvider#getMappingFor(org.springframework.data.mapping.PersistentProperty) - */ public ResourceMapping getMappingFor(PersistentProperty property) { return propertyCache.computeIfAbsent(property, it -> new PersistentPropertyResourceMapping(property, this)); } @@ -150,10 +126,6 @@ public class PersistentEntitiesResourceMappings implements ResourceMappings { return metadata != null && metadata.isExported(); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentPropertyResourceMapping.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentPropertyResourceMapping.java index 9cfa0d68b..c10e4c9c5 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentPropertyResourceMapping.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentPropertyResourceMapping.java @@ -55,10 +55,6 @@ class PersistentPropertyResourceMapping implements PropertyAwareResourceMapping this.description = Optional.ofNullable(property.findAnnotation(Description.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getPath() - */ @Override public Path getPath() { @@ -67,10 +63,6 @@ class PersistentPropertyResourceMapping implements PropertyAwareResourceMapping .orElseGet(() -> new Path(property.getName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getRel() - */ @Override public LinkRelation getRel() { @@ -79,10 +71,6 @@ class PersistentPropertyResourceMapping implements PropertyAwareResourceMapping .orElseGet(() -> property.getName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isExported() - */ @Override public boolean isExported() { @@ -97,19 +85,11 @@ class PersistentPropertyResourceMapping implements PropertyAwareResourceMapping : false; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isPagingResource() - */ @Override public boolean isPagingResource() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getDescription() - */ @Override public ResourceDescription getDescription() { @@ -122,10 +102,6 @@ class PersistentPropertyResourceMapping implements PropertyAwareResourceMapping .orElse(fallback); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.PropertyAwareResourceMapping#getProperty() - */ @Override public PersistentProperty getProperty() { return property; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryAwareResourceMetadata.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryAwareResourceMetadata.java index 9d8b04b43..d26e6c27e 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryAwareResourceMetadata.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryAwareResourceMetadata.java @@ -77,19 +77,11 @@ class RepositoryAwareResourceMetadata implements ResourceMetadata { return AnnotationUtils.findAnnotation(repositoryMetadata.getRepositoryInterface(), Primary.class) != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getDomainType() - */ @Override public Class getDomainType() { return repositoryMetadata.getDomainType(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.RootResourceMetadata#getProperty(java.lang.String) - */ @Override public PropertyAwareResourceMapping getProperty(String mappedPath) { @@ -100,109 +92,61 @@ class RepositoryAwareResourceMetadata implements ResourceMetadata { return mappingMetadata.getProperty(mappedPath); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadataProvider#getMappingFor(org.springframework.data.mapping.PersistentProperty) - */ @Override public ResourceMapping getMappingFor(PersistentProperty property) { return provider.getMappingFor(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadataProvider#hasMappingFor(org.springframework.data.mapping.PersistentProperty) - */ @Override public boolean isExported(PersistentProperty property) { return provider.isMapped(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#isExported() - */ @Override public boolean isExported() { return mapping.isExported(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getCollectionRel() - */ @Override public LinkRelation getRel() { return mapping.getRel(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getSingleResourceRel() - */ @Override public LinkRelation getItemResourceRel() { return mapping.getItemResourceRel(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getPath() - */ @Override public Path getPath() { return mapping.getPath(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#isPagingResource() - */ @Override public boolean isPagingResource() { return mapping.isPagingResource(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getDescription() - */ @Override public ResourceDescription getDescription() { return mapping.getDescription(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getItemResourceDescription() - */ @Override public ResourceDescription getItemResourceDescription() { return mapping.getItemResourceDescription(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getExcerptProjection() - */ @Override public Optional> getExcerptProjection() { return mapping.getExcerptProjection(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getSearchResourceMappings() - */ @Override public SearchResourceMappings getSearchResourceMappings() { return provider.getSearchResourceMappings(repositoryMetadata.getDomainType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMetadata#getSupportedHttpMethods() - */ @Override public SupportedHttpMethods getSupportedHttpMethods() { return crudMethodsSupportedHttpMethods; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryCollectionResourceMapping.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryCollectionResourceMapping.java index b02696fb5..6e6d46156 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryCollectionResourceMapping.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryCollectionResourceMapping.java @@ -145,73 +145,41 @@ class RepositoryCollectionResourceMapping implements CollectionResourceMapping { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getPath() - */ @Override public Path getPath() { return path; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getRel() - */ @Override public LinkRelation getRel() { return rel.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getSingleResourceRel() - */ @Override public LinkRelation getItemResourceRel() { return itemResourceRel.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isExported() - */ @Override public boolean isExported() { return repositoryExported; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#isPagingResource() - */ @Override public boolean isPagingResource() { return metadata.isPagingRepository(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getDescription() - */ @Override public ResourceDescription getDescription() { return description.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getItemResourceDescription() - */ @Override public ResourceDescription getItemResourceDescription() { return itemDescription.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getExcerptProjection() - */ @Override public Optional> getExcerptProjection() { return excerptProjection.getOptional(); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryMethodResourceMapping.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryMethodResourceMapping.java index 5e53e1500..2933efe95 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryMethodResourceMapping.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryMethodResourceMapping.java @@ -102,82 +102,46 @@ class RepositoryMethodResourceMapping implements MethodResourceMapping { return Collections.unmodifiableList(result); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isExported() - */ @Override public boolean isExported() { return isExported; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getRel() - */ @Override public LinkRelation getRel() { return rel; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getPath() - */ @Override public Path getPath() { return path; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.MethodResourceMapping#getMethod() - */ @Override public Method getMethod() { return method; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.MethodResourceMapping#getParameterMetadata() - */ @Override public ParametersMetadata getParametersMetadata() { return new ParametersMetadata(parameterMetadata); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isPagingResource() - */ @Override public boolean isPagingResource() { return paging; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.MethodResourceMapping#isSortableResource() - */ @Override public boolean isSortableResource() { return sorting; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getDescription() - */ @Override public ResourceDescription getDescription() { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.MethodResourceMapping#getProjectionSourceType() - */ @Override public Class getReturnedDomainType() { return metadata.getReturnedDomainClass(method); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryResourceMappings.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryResourceMappings.java index bb7a64d73..08072b121 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryResourceMappings.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/RepositoryResourceMappings.java @@ -93,10 +93,6 @@ public class RepositoryResourceMappings extends PersistentEntitiesResourceMappin } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#getSearchResourceMappings(java.lang.Class) - */ @Override public SearchResourceMappings getSearchResourceMappings(Class domainType) { @@ -125,10 +121,6 @@ public class RepositoryResourceMappings extends PersistentEntitiesResourceMappin return searchResourceMappings; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMappings#hasMappingFor(java.lang.Class) - */ @Override public boolean hasMappingFor(Class type) { @@ -143,10 +135,6 @@ public class RepositoryResourceMappings extends PersistentEntitiesResourceMappin return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.PersistentEntitiesResourceMappings#isMapped(org.springframework.data.mapping.PersistentProperty) - */ @Override public boolean isMapped(PersistentProperty property) { return repositories.hasRepositoryFor(property.getActualType()) && super.isMapped(property); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ResolvableResourceDescriptionSupport.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ResolvableResourceDescriptionSupport.java index 97751dab2..bcfb6efd2 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ResolvableResourceDescriptionSupport.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ResolvableResourceDescriptionSupport.java @@ -24,19 +24,11 @@ import org.springframework.context.MessageSourceResolvable; */ public abstract class ResolvableResourceDescriptionSupport implements ResourceDescription { - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getArguments() - */ @Override public Object[] getArguments() { return new Object[0]; } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getDefaultMessage() - */ @Override public String getDefaultMessage() { return null; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SearchResourceMappings.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SearchResourceMappings.java index 3a8228917..6748ba511 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SearchResourceMappings.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SearchResourceMappings.java @@ -130,55 +130,31 @@ public class SearchResourceMappings implements Iterable, return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getPath() - */ @Override public Path getPath() { return PATH; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getRel() - */ @Override public LinkRelation getRel() { return REL; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isExported() - */ @Override public boolean isExported() { return !mappings.isEmpty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isPagingResource() - */ @Override public boolean isPagingResource() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getDescription() - */ @Override public ResourceDescription getDescription() { return null; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return mappings.values().iterator(); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SimpleResourceDescription.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SimpleResourceDescription.java index 6028d359c..baa5ca7de 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SimpleResourceDescription.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SimpleResourceDescription.java @@ -50,34 +50,18 @@ public class SimpleResourceDescription extends ResolvableResourceDescriptionSupp return new SimpleResourceDescription(String.format("%s.%s", DEFAULT_KEY_PREFIX, rel.value()), DEFAULT_MEDIA_TYPE); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceDescription#getMessage() - */ public String getMessage() { return message; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceDescription#getType() - */ public MediaType getType() { return mediaType; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceDescription#isDefault() - */ public boolean isDefault() { return StringUtils.hasText(message) && message.startsWith(DEFAULT_KEY_PREFIX); } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getCodes() - */ @Override public String[] getCodes() { return new String[] { message }; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SupportedHttpMethods.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SupportedHttpMethods.java index da1e82ee3..f8670cc97 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SupportedHttpMethods.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/SupportedHttpMethods.java @@ -59,28 +59,16 @@ public interface SupportedHttpMethods { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#getSupportedHttpMethods(org.springframework.data.rest.core.mapping.ResourceType) - */ @Override public HttpMethods getMethodsFor(ResourceType resourcType) { return HttpMethods.none(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#getMethodsFor(org.springframework.data.mapping.PersistentProperty) - */ @Override public HttpMethods getMethodsFor(PersistentProperty property) { return HttpMethods.none(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.SupportedHttpMethods#allowsPutForCreation() - */ @Override public boolean allowsPutForCreation() { return false; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypeBasedCollectionResourceMapping.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypeBasedCollectionResourceMapping.java index 3fe0cb102..00a5d27df 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypeBasedCollectionResourceMapping.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypeBasedCollectionResourceMapping.java @@ -109,19 +109,11 @@ class TypeBasedCollectionResourceMapping implements CollectionResourceMapping { }); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getPath() - */ @Override public Path getPath() { return path.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#isExported() - */ @Override public boolean isExported() { @@ -130,55 +122,31 @@ class TypeBasedCollectionResourceMapping implements CollectionResourceMapping { .orElseGet(() -> Modifier.isPublic(type.getModifiers())); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getRel() - */ @Override public LinkRelation getRel() { return rel.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getSingleResourceRel() - */ @Override public LinkRelation getItemResourceRel() { return relProvider.getItemResourceRelFor(type); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#isPagingResource() - */ @Override public boolean isPagingResource() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResourceMapping#getDescription() - */ @Override public ResourceDescription getDescription() { return description.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getItemResourceDescription() - */ @Override public ResourceDescription getItemResourceDescription() { return itemResourceDescription.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.CollectionResourceMapping#getExcerptProjection() - */ @Override public Optional> getExcerptProjection() { return Optional.empty(); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypedResourceDescription.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypedResourceDescription.java index 00f3afe1d..c871bb532 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypedResourceDescription.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/TypedResourceDescription.java @@ -63,19 +63,11 @@ public class TypedResourceDescription extends SimpleResourceDescription { return new TypedResourceDescription(message, DEFAULT_MEDIA_TYPE, type); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResolvableResourceDescriptionSupport#getArguments() - */ @Override public Object[] getArguments() { return type.isEnum() ? new Object[] { getEnumValues(type) } : new Object[0]; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.mapping.ResolvableResourceDescriptionSupport#getDefaultMessage() - */ @Override public String getDefaultMessage() { return type.isEnum() ? getEnumValues(type) : null; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DefaultSelfLinkProvider.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DefaultSelfLinkProvider.java index 05c481278..6ebe88439 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DefaultSelfLinkProvider.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DefaultSelfLinkProvider.java @@ -63,10 +63,6 @@ public class DefaultSelfLinkProvider implements SelfLinkProvider { this.conversionService = conversionService; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.support.SelfLinkProvider#createSelfLinkFor(java.lang.Object) - */ public Link createSelfLinkFor(Object instance) { Assert.notNull(instance, "Domain object must not be null!"); @@ -74,10 +70,6 @@ public class DefaultSelfLinkProvider implements SelfLinkProvider { return createSelfLinkFor(instance.getClass(), instance); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.support.SelfLinkProvider#createSelfLinkFor(java.lang.Class, java.lang.Object) - */ public Link createSelfLinkFor(Class type, Object reference) { if (type.isInstance(reference)) { diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/EntityLookupSupport.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/EntityLookupSupport.java index 78fd76914..df395cc9d 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/EntityLookupSupport.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/EntityLookupSupport.java @@ -36,10 +36,6 @@ public abstract class EntityLookupSupport implements EntityLookup { this.domainType = GenericTypeResolver.resolveTypeArgument(getClass(), EntityLookup.class); } - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(Class delimiter) { return domainType.isAssignableFrom(delimiter); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/RepositoryRelProvider.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/RepositoryRelProvider.java index 7fdb093d4..fa3e0926a 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/RepositoryRelProvider.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/RepositoryRelProvider.java @@ -44,28 +44,16 @@ public class RepositoryRelProvider implements LinkRelationProvider { this.mappings = mappings; } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.LinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) - */ @Override public LinkRelation getCollectionResourceRelFor(Class type) { return mappings.getObject().getMetadataFor(type).getRel(); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.LinkRelationProvider#getItemResourceRelFor(java.lang.Class) - */ @Override public LinkRelation getItemResourceRelFor(Class type) { return mappings.getObject().getMetadataFor(type).getItemResourceRel(); } - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(LookupContext context) { return mappings.getObject().hasMappingFor(context.getType()); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/SimpleRelProvider.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/SimpleRelProvider.java index 7a0855e32..38ec25d51 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/SimpleRelProvider.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/SimpleRelProvider.java @@ -24,19 +24,11 @@ import org.springframework.util.StringUtils; */ public class SimpleRelProvider implements LinkRelationProvider { - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(LookupContext context) { return true; } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.LinkRelationProvider#getItemResourceRelFor(java.lang.Class) - */ @Override public LinkRelation getItemResourceRelFor(Class type) { @@ -44,10 +36,6 @@ public class SimpleRelProvider implements LinkRelationProvider { return LinkRelation.of(String.format("%s.%s", collectionRel.value(), collectionRel.value())); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.LinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) - */ @Override public LinkRelation getCollectionResourceRelFor(Class type) { return LinkRelation.of(StringUtils.uncapitalize(type.getSimpleName())); diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactory.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactory.java index 689839cb8..a4fa45d94 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactory.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactory.java @@ -54,10 +54,6 @@ public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFact this.lookups = PluginRegistry.of(lookups); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvokerFactory#getInvokerFor(java.lang.Class) - */ @Override public RepositoryInvoker getInvokerFor(Class domainType) { @@ -86,10 +82,6 @@ public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFact this.lookup = lookup; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeFindOne(java.io.Serializable) - */ @Override @SuppressWarnings("unchecked") public Optional invokeFindById(Object id) { @@ -99,83 +91,47 @@ public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFact : 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.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#invokeFindAll(org.springframework.data.domain.Pageable) - */ @Override public Iterable invokeFindAll(Pageable pageable) { return delegate.invokeFindAll(pageable); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.support.RepositoryInvoker#invokeFindAll(org.springframework.data.domain.Sort) - */ @Override public Iterable invokeFindAll(Sort sort) { return delegate.invokeFindAll(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/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/OrderRepository.java b/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/OrderRepository.java index 9b60d6437..94a43980f 100644 --- a/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/OrderRepository.java +++ b/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/OrderRepository.java @@ -25,18 +25,10 @@ import org.springframework.data.repository.CrudRepository; */ public interface OrderRepository extends CrudRepository { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object) - */ @Override @SuppressWarnings("unchecked") Order save(Order entity); - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findById(java.lang.Object) - */ @Override Optional findById(UUID id); } diff --git a/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/PersonBeforeSaveHandler.java b/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/PersonBeforeSaveHandler.java index 4f5f51aac..5f5929c02 100644 --- a/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/PersonBeforeSaveHandler.java +++ b/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/PersonBeforeSaveHandler.java @@ -23,10 +23,6 @@ import org.springframework.data.rest.core.event.AbstractRepositoryEventListener; */ public class PersonBeforeSaveHandler extends AbstractRepositoryEventListener { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.event.AbstractRepositoryEventListener#onBeforeSave(java.lang.Object) - */ @Override protected void onBeforeSave(Person person) { throw new EventHandlerInvokedException(); diff --git a/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvokerUnitTests.java b/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvokerUnitTests.java index 9be57b607..eb882ec8a 100755 --- a/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvokerUnitTests.java +++ b/spring-data-rest-core/src/test/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvokerUnitTests.java @@ -225,10 +225,6 @@ class AnnotatedEventHandlerInvokerUnitTests { Map invocations = new HashMap<>(); - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) - */ @Override public Object invoke(MethodInvocation invocation) throws Throwable { diff --git a/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerConfiguration.java b/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerConfiguration.java index 5915b231d..64f7805d6 100644 --- a/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerConfiguration.java +++ b/spring-data-rest-hal-explorer/src/main/java/org/springframework/data/rest/webmvc/halexplorer/HalExplorerConfiguration.java @@ -32,10 +32,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry @Configuration(proxyBeanMethods = false) class HalExplorerConfiguration implements StaticResourceProvider { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.StaticResourceProvider#customizeResources(org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry, org.springframework.data.rest.core.config.RepositoryRestConfiguration) - */ public void customizeResources(ResourceHandlerRegistry registry, RepositoryRestConfiguration configuration) { String basePath = configuration.getBasePath().toString().concat(HalExplorer.EXPLORER); diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/ResourceTester.java b/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/ResourceTester.java index f85379112..a402c89e8 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/ResourceTester.java +++ b/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/ResourceTester.java @@ -142,10 +142,6 @@ public class ResourceTester { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.ResourceTester.ContentResourceHandler#doWith(org.springframework.data.rest.webmvc.ResourceTester) - */ @Override public void doWith(ResourceTester content) { diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/TestMatchers.java b/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/TestMatchers.java index 01cb8afc2..b9637bd92 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/TestMatchers.java +++ b/spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/TestMatchers.java @@ -39,19 +39,11 @@ public class TestMatchers { return new TypeSafeMatcher(String.class) { - /* - * (non-Javadoc) - * @see org.hamcrest.SelfDescribing#describeTo(org.hamcrest.Description) - */ @Override public void describeTo(Description description) { description.appendText("contains " + number + " lines"); } - /* - * (non-Javadoc) - * @see org.hamcrest.TypeSafeMatcher#describeMismatchSafely(java.lang.Object, org.hamcrest.Description) - */ @Override protected void describeMismatchSafely(String item, Description mismatchDescription) { @@ -61,10 +53,6 @@ public class TestMatchers { .appendText(" lines"); } - /* - * (non-Javadoc) - * @see org.hamcrest.TypeSafeMatcher#matchesSafely(java.lang.Object) - */ @Override protected boolean matchesSafely(String item) { return numberOfLines(item) == number; diff --git a/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java index a67ebd5ca..4041c1211 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java @@ -44,10 +44,6 @@ public class AbstractPersistentEntity { this.id = null; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -64,10 +60,6 @@ public class AbstractPersistentEntity { return this.id.equals(that.getId()); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return id == null ? 0 : id.hashCode(); diff --git a/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java index 4c312a978..1fe49605a 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java @@ -60,19 +60,11 @@ public final class EmailAddress { return candidate == null ? false : PATTERN.matcher(candidate).matches(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return value; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -88,10 +80,6 @@ public final class EmailAddress { return this.value.equals(that.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return value.hashCode(); @@ -100,10 +88,6 @@ public final class EmailAddress { @Component static class EmailAddressToStringConverter implements Converter { - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public String convert(EmailAddress source) { return source == null ? null : source.value; @@ -113,10 +97,6 @@ public final class EmailAddress { @Component static class StringToEmailAddressConverter implements Converter { - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ public EmailAddress convert(String source) { return StringUtils.hasText(source) ? new EmailAddress(source) : null; } diff --git a/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java index 29bbbe824..5e5182666 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java @@ -25,10 +25,6 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration(classes = GeodeRepositoryConfig.class) class GeodeWebTests extends CommonWebTests { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.AbstractWebIntegrationTests#expectedRootLinkRels() - */ @Override protected Iterable expectedRootLinkRels() { return LinkRelation.manyOf("products"); diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/BookIdConverter.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/BookIdConverter.java index e6116f60c..c12e4fa22 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/BookIdConverter.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/main/java/org/springframework/data/rest/webmvc/jpa/BookIdConverter.java @@ -29,19 +29,11 @@ import org.springframework.util.StringUtils; */ public class BookIdConverter implements BackendIdConverter { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.BackendIdConverter#fromRequestId(java.lang.String, java.lang.Class) - */ @Override public Serializable fromRequestId(String id, Class entityType) { return Long.parseLong(id.substring(0, id.indexOf('-'))); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.BackendIdConverter#toRequestId(java.lang.Object, java.lang.Class) - */ @Override public String toRequestId(Serializable id, Class entityType) { @@ -55,10 +47,6 @@ public class BookIdConverter implements BackendIdConverter { return StringUtils.collectionToDelimitedString(ids, "-"); } - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(Class delimiter) { return Book.class.equals(delimiter); diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/JpaWebTests.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/JpaWebTests.java index fcaa14196..2718d5305 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/JpaWebTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/JpaWebTests.java @@ -107,10 +107,6 @@ public class JpaWebTests extends CommonWebTests { */ static class RepositoryLinkAffordanceAdder implements RepresentationModelProcessor { - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.RepresentationModelProcessor#process(org.springframework.hateoas.RepresentationModel) - */ @Override public RepositoryLinksResource process(RepositoryLinksResource model) { @@ -119,10 +115,6 @@ public class JpaWebTests extends CommonWebTests { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.AbstractWebIntegrationTests#setUp() - */ @Override @BeforeEach public void setUp() { @@ -130,28 +122,16 @@ public class JpaWebTests extends CommonWebTests { super.setUp(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.AbstractWebIntegrationTests#expectedRootLinkRels() - */ @Override protected Iterable expectedRootLinkRels() { return LinkRelation.manyOf("people", "authors", "books"); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.AbstractWebIntegrationTests#getPayloadToPost() - */ @Override protected Map getPayloadToPost() throws Exception { return Collections.singletonMap(LinkRelation.of("people"), readFileFromClasspath("person.json")); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.AbstractWebIntegrationTests#getRootAndLinkedResources() - */ @Override protected MultiValueMap getRootAndLinkedResources() { diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/UserRepository.java b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/UserRepository.java index a1d08e7e2..01a0a035b 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/UserRepository.java +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/UserRepository.java @@ -34,10 +34,6 @@ public interface UserRepository extends PagingAndSortingRepository findByColleaguesContains(@Param("colleagues") User colleague); - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.binding.QuerydslBinderCustomizer#customize(org.springframework.data.querydsl.binding.QuerydslBindings, com.querydsl.core.types.EntityPath) - */ @Override default void customize(QuerydslBindings bindings, QUser root) { bindings.bind(root.firstname).first((path, value) -> path.containsIgnoreCase(value)); diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoDbRepositoryConfig.java b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoDbRepositoryConfig.java index be2261fc9..cbd79fda7 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoDbRepositoryConfig.java +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoDbRepositoryConfig.java @@ -32,28 +32,16 @@ import com.mongodb.client.MongoClients; @EnableMongoAuditing public class MongoDbRepositoryConfig extends AbstractMongoClientConfiguration { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#getDatabaseName() - */ @Override protected String getDatabaseName() { return "spring-data-rest-sample"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#getMappingBasePackage() - */ @Override protected String getMappingBasePackage() { return ""; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#mongo() - */ @Override public MongoClient mongoClient() { return MongoClients.create(); diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoWebTests.java b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoWebTests.java index 6c00ac700..415aa7653 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoWebTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/tests/mongodb/MongoWebTests.java @@ -128,10 +128,6 @@ class MongoWebTests extends CommonWebTests { userRepository.deleteAll(); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.AbstractWebIntegrationTests#expectedRootLinkRels() - */ @Override protected Iterable expectedRootLinkRels() { return LinkRelation.manyOf("profiles", "users"); diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/src/main/java/org/springframework/data/rest/tests/shop/Address.java b/spring-data-rest-tests/spring-data-rest-tests-shop/src/main/java/org/springframework/data/rest/tests/shop/Address.java index e8c5471f9..f09baa568 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/src/main/java/org/springframework/data/rest/tests/shop/Address.java +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/src/main/java/org/springframework/data/rest/tests/shop/Address.java @@ -32,10 +32,6 @@ public class Address { private @Id UUID id = UUID.randomUUID(); private final String street, zipCode, city, state; - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ public String toString() { return String.format("%s, %s %s, %s", street, zipCode, city, state); } diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java b/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java index 5b17e250d..e610bea40 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/src/test/java/org/springframework/data/rest/tests/shop/ShopConfiguration.java @@ -47,10 +47,6 @@ class ShopConfiguration { public RepresentationModelProcessor> lineItemResourceProcessor() { return new RepresentationModelProcessor>() { - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.RepresentationModelProcessor#process(org.springframework.hateoas.RepresentationModel) - */ @Override public EntityModel process(EntityModel resource) { resource.add(Link.of("foo", "bar")); @@ -64,10 +60,6 @@ class ShopConfiguration { return new RepresentationModelProcessor>() { - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.RepresentationModelProcessor#process(org.springframework.hateoas.RepresentationModel) - */ @Override public EntityModel process(EntityModel resource) { resource.add(Link.of("alpha", "beta")); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java index 1ff5026cf..918f8484d 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java @@ -76,10 +76,6 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping { } } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#lookupHandlerMethod(java.lang.String, jakarta.servlet.http.HttpServletRequest) - */ @Override protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception { @@ -106,19 +102,11 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping { return super.lookupHandlerMethod(lookupPath, new CustomAcceptHeaderHttpServletRequest(request, mediaTypes)); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.handler.AbstractHandlerMapping#hasCorsConfigurationSource(java.lang.Object) - */ @Override protected boolean hasCorsConfigurationSource(Object handler) { return true; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping#getMappingForMethod(java.lang.reflect.Method, java.lang.Class) - */ @Override protected RequestMappingInfo getMappingForMethod(Method method, Class handlerType) { @@ -215,10 +203,6 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping { this.acceptMediaTypeStrings = acceptMediaTypeStrings; } - /* - * (non-Javadoc) - * @see jakarta.servlet.http.HttpServletRequestWrapper#getHeader(java.lang.String) - */ @Override public String getHeader(String name) { @@ -227,10 +211,6 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping { : super.getHeader(name); } - /* - * (non-Javadoc) - * @see jakarta.servlet.http.HttpServletRequestWrapper#getHeaders(java.lang.String) - */ @Override public Enumeration getHeaders(String name) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResource.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResource.java index 7e4827f72..9eb025f3c 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResource.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResource.java @@ -234,10 +234,6 @@ public class PersistentEntityResource extends EntityModel { super(content); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.RepresentationModel#getLinks() - */ @Override @JsonIgnore public Links getLinks() { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java index 2e402ab46..87e322f19 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java @@ -62,10 +62,6 @@ public class PersistentEntityResourceAssembler this.embeddedAssembler = new EmbeddedResourcesAssembler(entities, associations, projector); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.RepresentationModelAssembler#toModel(java.lang.Object) - */ @Override public PersistentEntityResource toModel(Object instance) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java index aef4994c2..ad7a806ba 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java @@ -117,10 +117,6 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem this.resourceStatus = ResourceStatus.of(headersPreparer); } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) - */ @Override public void setApplicationEventPublisher(ApplicationEventPublisher publisher) { this.publisher = publisher; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java index 0c97ea3fb..420f2b76f 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java @@ -99,10 +99,6 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro this.repositoryInvokerFactory = repositoryInvokerFactory; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) - */ @Override public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { this.publisher = applicationEventPublisher; @@ -491,10 +487,6 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro String.format(message, parameters)); } - /* - * (non-Javadoc) - * @see java.lang.Throwable#getMessage() - */ @Nullable @Override public String getMessage() { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerAdapter.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerAdapter.java index ed7619a2e..2ee787cfd 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerAdapter.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerAdapter.java @@ -46,29 +46,17 @@ public class RepositoryRestHandlerAdapter extends RequestMappingHandlerAdapter { this.argumentResolvers = argumentResolvers; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.RepresentationModelProcessorInvokingHandlerAdapter#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { setCustomArgumentResolvers(argumentResolvers); super.afterPropertiesSet(); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter#getOrder() - */ @Override public int getOrder() { return Ordered.HIGHEST_PRECEDENCE; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter#supportsInternal(org.springframework.web.method.HandlerMethod) - */ @Override protected boolean supportsInternal(HandlerMethod handlerMethod) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java index 4a85be642..78da8b0ca 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java @@ -124,10 +124,6 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping { this.jpaHelper = Optional.ofNullable(jpaHelper); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping#setEmbeddedValueResolver(org.springframework.util.StringValueResolver) - */ @Override public void setEmbeddedValueResolver(StringValueResolver resolver) { @@ -137,10 +133,6 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping { resolver == null ? NoOpStringValueResolver.INSTANCE : resolver, repositories); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#lookupHandlerMethod(java.lang.String, jakarta.servlet.http.HttpServletRequest) - */ @Override protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception { @@ -168,29 +160,17 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping { return handlerMethod; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#handleNoMatch(java.util.Set, java.lang.String, jakarta.servlet.http.HttpServletRequest) - */ @Override protected HandlerMethod handleNoMatch(Set requestMappingInfos, String lookupPath, HttpServletRequest request) throws ServletException { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.BasePathAwareHandlerMapping#isHandlerInternal(java.lang.Class) - */ @Override protected boolean isHandlerInternal(Class type) { return AnnotatedElementUtils.hasAnnotation(type, RepositoryRestController.class); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.handler.AbstractHandlerMapping#extendInterceptors(java.util.List) - */ @Override protected void extendInterceptors(List interceptors) { @@ -199,10 +179,6 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping { .forEach(interceptors::add); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.BasePathAwareHandlerMapping#process(org.springframework.web.servlet.mvc.condition.ProducesRequestCondition) - */ @Override protected ProducesRequestCondition customize(ProducesRequestCondition condition) { @@ -218,9 +194,6 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping { return new ProducesRequestCondition(mediaTypes.toArray(new String[mediaTypes.size()])); } - /* (non-Javadoc) - * @see org.springframework.web.servlet.handler.AbstractHandlerMethodMapping#getCorsConfiguration(java.lang.Object, jakarta.servlet.http.HttpServletRequest) - */ @Override protected CorsConfiguration getCorsConfiguration(Object handler, HttpServletRequest request) { @@ -299,10 +272,6 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.util.StringValueResolver#resolveStringValue(java.lang.String) - */ @Override public String resolveStringValue(String value) { return value; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/AlpsJsonHttpMessageConverter.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/AlpsJsonHttpMessageConverter.java index 2799d6937..31a5f45f6 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/AlpsJsonHttpMessageConverter.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/AlpsJsonHttpMessageConverter.java @@ -65,38 +65,22 @@ public class AlpsJsonHttpMessageConverter extends MappingJackson2HttpMessageConv setSupportedMediaTypes(Arrays.asList(MediaTypes.ALPS_JSON, MediaType.APPLICATION_JSON, MediaType.ALL)); } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter#canWrite(java.lang.Class, org.springframework.http.MediaType) - */ @Override public boolean canWrite(Class clazz, MediaType mediaType) { return (clazz.isAssignableFrom(Alps.class) || clazz.isAssignableFrom(RootResourceInformation.class)) && super.canWrite(clazz, mediaType); } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.AbstractGenericHttpMessageConverter#canWrite(java.lang.reflect.Type, java.lang.Class, org.springframework.http.MediaType) - */ @Override public boolean canWrite(Type type, Class clazz, MediaType mediaType) { return canWrite(clazz, mediaType); } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter#canRead(java.lang.reflect.Type, java.lang.Class, org.springframework.http.MediaType) - */ @Override public boolean canRead(Type type, Class contextClass, MediaType mediaType) { return false; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice#beforeBodyWrite(java.lang.Object, org.springframework.core.MethodParameter, org.springframework.http.MediaType, java.lang.Class, org.springframework.http.server.ServerHttpRequest, org.springframework.http.server.ServerHttpResponse) - */ @Override public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class> selectedConverterType, ServerHttpRequest request, @@ -107,10 +91,6 @@ public class AlpsJsonHttpMessageConverter extends MappingJackson2HttpMessageConv : body; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice#supports(org.springframework.core.MethodParameter, java.lang.Class) - */ @Override public boolean supports(MethodParameter returnType, Class> converterType) { return converterType.equals(AlpsJsonHttpMessageConverter.class); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/RootResourceInformationToAlpsDescriptorConverter.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/RootResourceInformationToAlpsDescriptorConverter.java index 6da71d180..2cc32f6c1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/RootResourceInformationToAlpsDescriptorConverter.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/alps/RootResourceInformationToAlpsDescriptorConverter.java @@ -112,10 +112,6 @@ public class RootResourceInformationToAlpsDescriptorConverter { this.translator = translator; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ public Alps convert(RootResourceInformation resourceInformation) { Class type = resourceInformation.getDomainType(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ArgumentResolverPagingAndSortingTemplateVariables.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ArgumentResolverPagingAndSortingTemplateVariables.java index c4e61c89d..8f838ad8b 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ArgumentResolverPagingAndSortingTemplateVariables.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ArgumentResolverPagingAndSortingTemplateVariables.java @@ -64,28 +64,16 @@ class ArgumentResolverPagingAndSortingTemplateVariables implements PagingAndSort this.sortResolver = sortResolver; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.PagingAndSortingTemplateVariables#getPaginationTemplateVariables(org.springframework.core.MethodParameter, org.springframework.web.util.UriComponents) - */ @Override public TemplateVariables getPaginationTemplateVariables(MethodParameter parameter, UriComponents components) { return pagingResolver.getPaginationTemplateVariables(parameter, components); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.PagingAndSortingTemplateVariables#getSortTemplateVariables(org.springframework.core.MethodParameter, org.springframework.web.util.UriComponents) - */ @Override public TemplateVariables getSortTemplateVariables(MethodParameter parameter, UriComponents template) { return 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, MethodParameter parameter, Object value) { @@ -96,10 +84,6 @@ class ArgumentResolverPagingAndSortingTemplateVariables implements PagingAndSort } } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.mvc.UriComponentsContributor#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return SUPPORTED_TYPES.contains(parameter.getParameterType()); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java index 70c5f42db..1b87f9de1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java @@ -59,65 +59,37 @@ class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable getDelegates() { return this.delegates; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return delegates.iterator(); } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return Ordered.LOWEST_PRECEDENCE - 100; } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.HandlerMapping#getHandler(jakarta.servlet.http.HttpServletRequest) - */ @Override public HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception { return HandlerSelectionResult.from(request, delegates).resultOrException(); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.handler.MatchableHandlerMapping#match(jakarta.servlet.http.HttpServletRequest, java.lang.String) - */ @Override public RequestMatchResult match(HttpServletRequest request, String pattern) { @@ -200,10 +172,6 @@ class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable domainType, Map parameters) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryCorsRegistry.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryCorsRegistry.java index 213eb208c..1401151ce 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryCorsRegistry.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryCorsRegistry.java @@ -29,9 +29,6 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry; */ class RepositoryCorsRegistry extends CorsRegistry { - /* (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.CorsRegistry#getCorsConfigurations() - */ @Override public Map getCorsConfigurations() { return super.getCorsConfigurations(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurer.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurer.java index 5a2ad33c8..91632772f 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurer.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurer.java @@ -54,10 +54,6 @@ public interface RepositoryRestConfigurer { return new RepositoryRestConfigurer() { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureRepositoryRestConfiguration(org.springframework.data.rest.core.config.RepositoryRestConfiguration, org.springframework.web.servlet.config.annotation.CorsRegistry) - */ @Override public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) { consumer.accept(config); @@ -79,10 +75,6 @@ public interface RepositoryRestConfigurer { return new RepositoryRestConfigurer() { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureRepositoryRestConfiguration(org.springframework.data.rest.core.config.RepositoryRestConfiguration, org.springframework.web.servlet.config.annotation.CorsRegistry) - */ @Override public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) { consumer.accept(config, cors); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurerDelegate.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurerDelegate.java index 99a3c7c81..e54e77e8c 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurerDelegate.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurerDelegate.java @@ -52,10 +52,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { this.delegates = delegates; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureRepositoryRestConfiguration(org.springframework.data.rest.core.config.RepositoryRestConfiguration, org.springframework.web.servlet.config.annotation.CorsRegistry) - */ @Override public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) { @@ -64,10 +60,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureConversionService(org.springframework.core.convert.support.ConfigurableConversionService) - */ @Override public void configureConversionService(ConfigurableConversionService conversionService) { @@ -76,10 +68,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureExceptionHandlerExceptionResolver(org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver) - */ @Override public void configureExceptionHandlerExceptionResolver(ExceptionHandlerExceptionResolver exceptionResolver) { @@ -88,10 +76,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureHttpMessageConverters(java.util.List) - */ @Override public void configureHttpMessageConverters(List> messageConverters) { @@ -100,10 +84,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureJacksonObjectMapper(com.fasterxml.jackson.databind.ObjectMapper) - */ @Override public void configureJacksonObjectMapper(ObjectMapper objectMapper) { @@ -112,10 +92,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureValidatingRepositoryEventListener(org.springframework.data.rest.core.event.ValidatingRepositoryEventListener) - */ @Override public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener validatingListener) { @@ -124,10 +100,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#configureAuditableBeanWrapperFactory(org.springframework.data.auditing.AuditableBeanWrapperFactory) - */ @Override public AuditableBeanWrapperFactory customizeAuditableBeanWrapperFactory(AuditableBeanWrapperFactory factory) { @@ -138,10 +110,6 @@ class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer { return factory; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer#customizeLinkCollector(org.springframework.data.rest.webmvc.mapping.LinkCollector) - */ @Override public LinkCollector customizeLinkCollector(LinkCollector collector) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java index c2ac9c0a1..f34a99cb7 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java @@ -277,10 +277,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon this.defaultMessageConverters = beansOfType(context, HttpMessageConverter.class); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; @@ -742,10 +738,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon return new DefaultExcerptProjector(projectionFactory, resourceMappings); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter#extendHandlerExceptionResolvers(java.util.List) - */ @Override public void extendHandlerExceptionResolvers(List exceptionResolvers) { @@ -815,10 +807,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon return new AlpsJsonHttpMessageConverter(alpsConverter); } - /* - * (non-Javadoc) - * @see org.springframework.data.web.config.HateoasAwareSpringDataWebConfiguration#pageableResolver() - */ @Bean @Override public HateoasPageableHandlerMethodArgumentResolver pageableResolver() { @@ -833,10 +821,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon return resolver; } - /* - * (non-Javadoc) - * @see org.springframework.data.web.config.HateoasAwareSpringDataWebConfiguration#sortResolver() - */ @Bean @Override public HateoasSortHandlerMethodArgumentResolver sortResolver() { @@ -987,10 +971,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon // HAL Browser // - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter#addResourceHandlers(org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry) - */ @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { @@ -1030,10 +1010,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon this.order = order; } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return order; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java index 3442617d1..bc280ecb0 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java @@ -63,19 +63,11 @@ public class ResourceMetadataHandlerMethodArgumentResolver implements HandlerMet this.baseUri = baseUri; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return isAssignable(parameter.getParameterType(), ResourceMetadata.class); } - /* - * (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 ResourceMetadata resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RestControllerImportSelector.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RestControllerImportSelector.java index 801ce7812..d3cc64273 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RestControllerImportSelector.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RestControllerImportSelector.java @@ -36,10 +36,6 @@ class RestControllerImportSelector implements ImportSelector { private static final String HAL_EXPLORER_CONFIGURATION = "org.springframework.data.rest.webmvc.halexplorer.HalExplorerConfiguration"; private static final String JMOLECULES_SPRING = "org.jmolecules.spring.IdentifierToPrimitivesConverter"; - /* - * (non-Javadoc) - * @see org.springframework.context.annotation.ImportSelector#selectImports(org.springframework.core.type.AnnotationMetadata) - */ @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RootResourceInformationHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RootResourceInformationHandlerMethodArgumentResolver.java index c5cda4481..b7f3ed59b 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RootResourceInformationHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RootResourceInformationHandlerMethodArgumentResolver.java @@ -63,19 +63,11 @@ public class RootResourceInformationHandlerMethodArgumentResolver implements Han this.resourceMetadataResolver = resourceMetadataResolver; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return RootResourceInformation.class.isAssignableFrom(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 RootResourceInformation resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/WebMvcRepositoryRestConfiguration.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/WebMvcRepositoryRestConfiguration.java index 2765a3773..49ed238c1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/WebMvcRepositoryRestConfiguration.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/WebMvcRepositoryRestConfiguration.java @@ -57,10 +57,6 @@ class WebMvcRepositoryRestConfiguration extends RepositoryRestConfiguration impl private final RepositoryCorsRegistry registry; - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.config.CorsConfigurationAware#getCorsConfigurations() - */ @Override public Map getCorsConfigurations() { return registry.getCorsConfigurations(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/convert/UriListHttpMessageConverter.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/convert/UriListHttpMessageConverter.java index ab5f8ba71..cf46567a3 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/convert/UriListHttpMessageConverter.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/convert/UriListHttpMessageConverter.java @@ -51,10 +51,6 @@ public class UriListHttpMessageConverter implements HttpMessageConverter clazz, MediaType mediaType) { @@ -63,28 +59,16 @@ public class UriListHttpMessageConverter implements HttpMessageConverter clazz, MediaType mediaType) { return canRead(clazz, mediaType); } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.HttpMessageConverter#getSupportedMediaTypes() - */ @Override public List getSupportedMediaTypes() { return MEDIA_TYPES; } - /* - * (non-Javadoc) - * @see org.springframework.http.converter.HttpMessageConverter#read(java.lang.Class, org.springframework.http.HttpInputMessage) - */ @Override public RepresentationModel read(Class> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { @@ -99,10 +83,6 @@ public class UriListHttpMessageConverter implements HttpMessageConverter resource, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/AggregateReferenceResolvingModule.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/AggregateReferenceResolvingModule.java index 18c1f1539..2755be2d6 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/AggregateReferenceResolvingModule.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/AggregateReferenceResolvingModule.java @@ -85,10 +85,6 @@ public class AggregateReferenceResolvingModule extends SimpleModule { this.mappings = mappings; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.deser.BeanDeserializerModifier#updateBuilder(com.fasterxml.jackson.databind.DeserializationConfig, com.fasterxml.jackson.databind.BeanDescription, com.fasterxml.jackson.databind.deser.BeanDeserializerBuilder) - */ @Override public BeanDeserializerBuilder updateBuilder(DeserializationConfig config, BeanDescription description, BeanDeserializerBuilder builder) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java index 8a7c1f3a9..874c845d1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java @@ -588,10 +588,6 @@ public class DomainObjectReader { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.SimpleAssociationHandler#doWithAssociation(org.springframework.data.mapping.Association) - */ @Override public void doWithAssociation(Association> association) { @@ -642,10 +638,6 @@ public class DomainObjectReader { return this.properties; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.SimplePropertyHandler#doWithPersistentProperty(org.springframework.data.mapping.PersistentProperty) - */ @Override public void doWithPersistentProperty(PersistentProperty property) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/EnumTranslator.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/EnumTranslator.java index b114ac326..875ff9a00 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/EnumTranslator.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/EnumTranslator.java @@ -53,19 +53,11 @@ public class EnumTranslator implements EnumTranslationConfiguration { this.parseEnumNameAsFallback = true; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EnumTranslationConfiguration#setEnableDefaultTranslation(boolean) - */ @Override public void setEnableDefaultTranslation(boolean enableDefaultTranslation) { this.enableDefaultTranslation = enableDefaultTranslation; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.core.config.EnumTranslationConfiguration#setParseEnumNameAsFallback(boolean) - */ @Override public void setParseEnumNameAsFallback(boolean parseEnumNameAsFallback) { this.parseEnumNameAsFallback = parseEnumNameAsFallback; @@ -191,19 +183,11 @@ public class EnumTranslator implements EnumTranslationConfiguration { return new TranslatedEnum(value, withDefaultTranslation); } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getCodes() - */ @Override public String[] getCodes() { return new String[] { String.format("%s.%s", value.getDeclaringClass().getName(), value.name()) }; } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getDefaultMessage() - */ @Override public String getDefaultMessage() { return withDefaultTranslation ? toDefault(value) : value.name(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonMetadata.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonMetadata.java index 8321d7b33..4d82b6b25 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonMetadata.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonMetadata.java @@ -173,10 +173,6 @@ public class JacksonMetadata implements Iterable { } } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return definitions.iterator(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonSerializers.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonSerializers.java index e93e2962b..a4cbbc7f4 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonSerializers.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonSerializers.java @@ -95,19 +95,11 @@ public class JacksonSerializers extends SimpleModule { this.translator = translator; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(Enum value, JsonGenerator gen, SerializerProvider provider) throws IOException { gen.writeString(translator.asText(value)); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.JsonSchemaPropertyCustomizer#customize(org.springframework.data.rest.webmvc.json.JsonSchema.JsonSchemaProperty, org.springframework.data.util.TypeInformation) - */ @Override public JsonSchemaProperty customize(JsonSchemaProperty property, TypeInformation type) { @@ -160,20 +152,12 @@ public class JacksonSerializers extends SimpleModule { this.property = property; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.deser.ContextualDeserializer#createContextual(com.fasterxml.jackson.databind.DeserializationContext, com.fasterxml.jackson.databind.BeanProperty) - */ @Override public JsonDeserializer createContextual(DeserializationContext ctxt, BeanProperty property) throws JsonMappingException { return new EnumTranslatingDeserializer(translator, property); } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext) - */ @Override @SuppressWarnings("unchecked") public Enum deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareDefaultedPageableArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareDefaultedPageableArgumentResolver.java index c90e4e6ad..72d7fd266 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareDefaultedPageableArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareDefaultedPageableArgumentResolver.java @@ -54,19 +54,11 @@ public class MappingAwareDefaultedPageableArgumentResolver implements HandlerMet this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return DefaultedPageable.class.isAssignableFrom(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 Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwarePageableArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwarePageableArgumentResolver.java index 0df7949ec..070fbf3fe 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwarePageableArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwarePageableArgumentResolver.java @@ -53,19 +53,11 @@ public class MappingAwarePageableArgumentResolver implements HandlerMethodArgume this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return delegate.supportsParameter(parameter); } - /* - * (non-Javadoc) - * @see org.springframework.data.web.PageableArgumentResolver#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, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareSortArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareSortArgumentResolver.java index 5839e9b87..241be674a 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareSortArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwareSortArgumentResolver.java @@ -50,19 +50,11 @@ public class MappingAwareSortArgumentResolver implements HandlerMethodArgumentRe this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return delegate.supportsParameter(parameter); } - /* - * (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 methodParameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2Module.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2Module.java index 3a5a9976f..19c3682b4 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2Module.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2Module.java @@ -168,10 +168,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.collector = collector; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(final PersistentEntityResource resource, final JsonGenerator jgen, final SerializerProvider provider) throws IOException, JsonGenerationException { @@ -251,10 +247,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.lookupObjectSerializer = lookupObjectSerializer; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.BeanSerializerModifier#changeProperties(com.fasterxml.jackson.databind.SerializationConfig, com.fasterxml.jackson.databind.BeanDescription, java.util.List) - */ @Override public List changeProperties(SerializationConfig config, BeanDescription beanDesc, List beanProperties) { @@ -354,10 +346,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.invoker = invoker; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) throws IOException { @@ -388,10 +376,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { } } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonSerializer#serializeWithType(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider, com.fasterxml.jackson.databind.jsontype.TypeSerializer) - */ @Override public void serializeWithType(Object value, JsonGenerator gen, SerializerProvider provider, TypeSerializer typeSerializer) throws IOException { @@ -448,10 +432,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.factory = factory; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.deser.BeanDeserializerModifier#updateBuilder(com.fasterxml.jackson.databind.DeserializationConfig, com.fasterxml.jackson.databind.BeanDescription, com.fasterxml.jackson.databind.deser.BeanDeserializerBuilder) - */ @Override public BeanDeserializerBuilder updateBuilder(DeserializationConfig config, BeanDescription beanDesc, BeanDeserializerBuilder builder) { @@ -609,10 +589,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.converter = converter; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext) - */ @Override public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { @@ -675,10 +651,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.unwrapping = unwrapping; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(TargetAware value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException { @@ -697,19 +669,11 @@ public class PersistentEntityJackson2Module extends SimpleModule { } } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonSerializer#isUnwrappingSerializer() - */ @Override public boolean isUnwrappingSerializer() { return unwrapping; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonSerializer#unwrappingSerializer(com.fasterxml.jackson.databind.util.NameTransformer) - */ @Override public JsonSerializer unwrappingSerializer(NameTransformer unwrapper) { return new ProjectionSerializer(collector, associations, invoker, true); @@ -780,10 +744,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.unwrapping = unwrapping; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(ProjectionResourceContent value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException { @@ -794,19 +754,11 @@ public class PersistentEntityJackson2Module extends SimpleModule { serialize(value.getProjection(), jgen, provider); } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonSerializer#isUnwrappingSerializer() - */ @Override public boolean isUnwrappingSerializer() { return unwrapping; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonSerializer#unwrappingSerializer(com.fasterxml.jackson.databind.util.NameTransformer) - */ @Override public JsonSerializer unwrappingSerializer(NameTransformer unwrapper) { return new ProjectionResourceContentSerializer(true); @@ -836,19 +788,11 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.property = property; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.deser.ValueInstantiator#getValueTypeDesc() - */ @Override public String getValueTypeDesc() { return property.getType().getName(); } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.deser.ValueInstantiator#createUsingDefault(com.fasterxml.jackson.databind.DeserializationContext) - */ @Override public Object createUsingDefault(DeserializationContext ctxt) throws IOException, JsonProcessingException { @@ -870,10 +814,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.invoker = factory.getInvokerFor(_valueClass); } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext) - */ @Override public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { @@ -896,10 +836,6 @@ public class PersistentEntityJackson2Module extends SimpleModule { this.lookups = lookups; } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.ToStringSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) throws IOException { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverter.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverter.java index 252d4a927..6c3994b85 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverter.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverter.java @@ -116,20 +116,12 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric } } - /* - * (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 Class.class.isAssignableFrom(sourceType.getType()) && JsonSchema.class.isAssignableFrom(targetType.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ @Override public Set getConvertibleTypes() { return convertiblePairs; @@ -145,10 +137,6 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric return convert(domainType, STRING_TYPE, SCHEMA_TYPE); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public JsonSchema convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { @@ -338,10 +326,6 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric return new JsonSchemaPropertyCustomizer() { - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.JsonSchemaPropertyCustomizer#customize(org.springframework.data.rest.webmvc.json.JsonSchema.JsonSchemaProperty, org.springframework.data.util.TypeInformation) - */ @Override public JsonSchemaProperty customize(JsonSchemaProperty property, TypeInformation type) { @@ -540,28 +524,16 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getArguments() - */ @Override public Object[] getArguments() { return delegate.getArguments(); } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getCodes() - */ @Override public String[] getCodes() { return delegate.getCodes(); } - /* - * (non-Javadoc) - * @see org.springframework.context.MessageSourceResolvable#getDefaultMessage() - */ @Override public String getDefaultMessage() { String defaultMessage = delegate.getDefaultMessage(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/AddOperation.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/AddOperation.java index 3f221abaf..c51ae1e8d 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/AddOperation.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/AddOperation.java @@ -40,19 +40,11 @@ class AddOperation extends PatchOperation { return new AddOperation(SpelPath.untyped(path), value); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#perform(java.lang.Object, java.lang.Class) - */ @Override void perform(Object targetObject, Class type) { path.bindTo(type).addValue(targetObject, evaluateValueFromTarget(targetObject, type)); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#evaluateValueFromTarget(java.lang.Object, java.lang.Class) - */ @Override protected Object evaluateValueFromTarget(Object targetObject, Class entityType) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/CopyOperation.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/CopyOperation.java index 2b6752802..281c31614 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/CopyOperation.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/CopyOperation.java @@ -77,10 +77,6 @@ class CopyOperation extends PatchOperation { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#perform(java.lang.Object, java.lang.Class) - */ @Override void perform(Object target, Class type) { path.bindTo(type).copyFrom(from, target); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java index 2b2d70e41..8689571d5 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java @@ -42,10 +42,6 @@ class JsonLateObjectEvaluator implements LateObjectEvaluator { this.node = node; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.LateObjectEvaluator#evaluate(java.lang.Class) - */ @Override public Object evaluate(Class type) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/MoveOperation.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/MoveOperation.java index 931d68701..4c1233531 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/MoveOperation.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/MoveOperation.java @@ -70,10 +70,6 @@ class MoveOperation extends PatchOperation { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#perform(java.lang.Object, java.lang.Class) - */ @Override void perform(Object target, Class type) { path.bindTo(type).moveFrom(from, target); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/Patch.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/Patch.java index 484762da5..13f4a8e1b 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/Patch.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/Patch.java @@ -85,10 +85,6 @@ public class Patch implements Streamable { return in; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return operations.iterator(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/RemoveOperation.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/RemoveOperation.java index 7e31ba853..03159f5f6 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/RemoveOperation.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/RemoveOperation.java @@ -39,10 +39,6 @@ class RemoveOperation extends PatchOperation { return new RemoveOperation(SpelPath.untyped(path)); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#perform(java.lang.Object, java.lang.Class) - */ @Override void perform(Object target, Class type) { path.bindTo(type).removeFrom(target); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/ReplaceOperation.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/ReplaceOperation.java index c3903d9d8..636ac2033 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/ReplaceOperation.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/ReplaceOperation.java @@ -53,10 +53,6 @@ class ReplaceOperation extends PatchOperation { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#perform(java.lang.Object, java.lang.Class) - */ @Override void perform(Object target, Class type) { path.bindTo(type).setValue(target, evaluateValueFromTarget(target, type)); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java index cf6c8c4d1..626bd436c 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java @@ -95,19 +95,11 @@ class SpelPath { return path.endsWith("-"); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return path; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -124,10 +116,6 @@ class SpelPath { return this.path.equals(that.path); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return path.hashCode(); @@ -186,10 +174,6 @@ class SpelPath { return new CacheKey(type, path); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -207,19 +191,11 @@ class SpelPath { && Objects.equals(path, that.path); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(type, path); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "SpelPath.TypedSpelPath.CacheKey(type=" + type + ", path=" + path + ")"; @@ -430,10 +406,6 @@ class SpelPath { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.SpelPath#toString() - */ @Override public String toString() { return String.format("%s on %s -> %s", path, type.getName(), getExpressionString()); @@ -535,10 +507,6 @@ class SpelPath { : SkippedPropertyPath.of(path.nested(segment), false); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -555,19 +523,11 @@ class SpelPath { && skipped == other.skipped; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(path, skipped); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "SpelPath.TypedSpelPath.SkippedPropertyPath(path=" + path + ", skipped=" + skipped + ")"; @@ -707,10 +667,6 @@ class SpelPath { return nested(segment); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -729,19 +685,11 @@ class SpelPath { && skipped == that.skipped; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(basePath, type, spelSegment, skipped); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "SpelPath.TypedSpelPath.SpelExpressionBuilder(basePath=" + this.getBasePath() + ", type=" @@ -749,10 +697,6 @@ class SpelPath { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.SpelPath#equals(java.lang.Object) - */ @Override public boolean equals(final java.lang.Object o) { @@ -770,10 +714,6 @@ class SpelPath { && Objects.equals(type, that.type); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.SpelPath#hashCode() - */ @Override public int hashCode() { return Objects.hash(expression, type); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/TestOperation.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/TestOperation.java index a80afa675..5299440f1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/TestOperation.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/TestOperation.java @@ -66,10 +66,6 @@ class TestOperation extends PatchOperation { } } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.json.patch.PatchOperation#perform(java.lang.Object, java.lang.Class) - */ @Override void perform(Object target, Class type) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/mapping/DefaultLinkCollector.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/mapping/DefaultLinkCollector.java index 0f9f7b495..a9e6a3fb5 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/mapping/DefaultLinkCollector.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/mapping/DefaultLinkCollector.java @@ -161,10 +161,6 @@ public class DefaultLinkCollector implements LinkCollector { return Links.of(links); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.SimpleAssociationHandler#doWithAssociation(org.springframework.data.mapping.Association) - */ @Override public void doWithAssociation(final Association> association) { @@ -207,10 +203,6 @@ public class DefaultLinkCollector implements LinkCollector { return this.links.toList(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.SimpleAssociationHandler#doWithAssociation(org.springframework.data.mapping.Association) - */ @Override public void doWithAssociation(Association> association) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/spi/BackendIdConverter.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/spi/BackendIdConverter.java index 644886f05..81ba72fb4 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/spi/BackendIdConverter.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/spi/BackendIdConverter.java @@ -53,28 +53,16 @@ public interface BackendIdConverter extends Plugin> { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.BackendIdConverter#fromRequestId(java.lang.String, java.lang.Class) - */ @Override public Serializable fromRequestId(String id, Class entityType) { return id; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.BackendIdConverter#toRequestId(java.lang.Object, java.lang.Class) - */ @Override public String toRequestId(Serializable id, Class entityType) { return id.toString(); } - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(Class delimiter) { return true; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolver.java index 6afefd64e..0c484aa7a 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolver.java @@ -64,19 +64,11 @@ public class BackendIdHandlerMethodArgumentResolver implements HandlerMethodArgu this.baseUri = baseUri; } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return parameter.hasParameterAnnotation(BackendId.class); } - /* - * (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 Serializable resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest request, WebDataBinderFactory binderFactory) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java index d293a7132..148874bec 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java @@ -43,10 +43,6 @@ public class DefaultExcerptProjector implements ExcerptProjector { this.mappings = mappings; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.ExcerptProjector#projectExcerpt(java.lang.Object) - */ @Override public Object projectExcerpt(Object source) { @@ -62,10 +58,6 @@ public class DefaultExcerptProjector implements ExcerptProjector { } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.ExcerptProjector#hasExcerptProjection(java.lang.Class) - */ @Override public boolean hasExcerptProjection(Class type) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java index fd11c2c7a..85de05ba8 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java @@ -66,10 +66,6 @@ public final class DefaultedPageable { return isDefault ? Pageable.unpaged() : pageable; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -87,19 +83,11 @@ public final class DefaultedPageable { && isDefault == that.isDefault; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(pageable, isDefault); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "DefaultedPageable(pageable=" + pageable + ", isDefault=" + isDefault + ")"; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageableHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageableHandlerMethodArgumentResolver.java index e352262d7..efc6bb943 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageableHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageableHandlerMethodArgumentResolver.java @@ -47,10 +47,6 @@ public class DefaultedPageableHandlerMethodArgumentResolver implements HandlerMe this.resolver = resolver; } - /* - * (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 Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { @@ -59,10 +55,6 @@ public class DefaultedPageableHandlerMethodArgumentResolver implements HandlerMe return new DefaultedPageable(pageable, resolver.isFallbackPageable(pageable)); } - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return DefaultedPageable.class.isAssignableFrom(parameter.getParameterType()); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java index f1d6ddbde..5316ec636 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java @@ -144,10 +144,6 @@ public final class ETag { return headers; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return value == null ? null : "\"".concat(value).concat("\""); @@ -173,10 +169,6 @@ public final class ETag { .map(Object::toString); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -193,10 +185,6 @@ public final class ETag { return Objects.equals(value, other.value); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(value); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETagArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETagArgumentResolver.java index 900a10bd9..af95692ce 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETagArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETagArgumentResolver.java @@ -33,19 +33,11 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ public class ETagArgumentResolver implements HandlerMethodArgumentResolver { - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return parameter.getParameterType().equals(ETag.class); } - /* - * (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 ETag resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/HttpMethodHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/HttpMethodHandlerMethodArgumentResolver.java index 7840f7921..b1beac822 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/HttpMethodHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/HttpMethodHandlerMethodArgumentResolver.java @@ -34,19 +34,11 @@ public enum HttpMethodHandlerMethodArgumentResolver implements HandlerMethodArgu INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return HttpMethod.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 HttpMethod resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/PersistentEntityProjector.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/PersistentEntityProjector.java index 6cfe24e47..d8166a801 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/PersistentEntityProjector.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/PersistentEntityProjector.java @@ -55,18 +55,10 @@ public class PersistentEntityProjector extends DefaultExcerptProjector implement this.projection = projection; } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.Projector#project(java.lang.Object) - */ public Object project(Object source) { return projectWithDefault(source, Function.identity()); } - /* - * (non-Javadoc) - * @see org.springframework.data.rest.webmvc.support.DefaultExcerptProjector#projectExcerpt(java.lang.Object) - */ @Override public Object projectExcerpt(Object source) { return projectWithDefault(source, PersistentEntityProjector.super::projectExcerpt); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java index bd752b575..b1cdd7e8f 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java @@ -99,10 +99,6 @@ public class RepositoryConstraintViolationExceptionMessage { return this.message; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -122,19 +118,11 @@ public class RepositoryConstraintViolationExceptionMessage { && Objects.equals(message, other.message); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(entity, property, invalidValue, message); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public java.lang.String toString() { return "RepositoryConstraintViolationExceptionMessage.ValidationError(entity=" + entity + ", property=" + property diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java index c2f08b523..262fde6d6 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java @@ -89,19 +89,11 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { this.idConverters = idConverters; } - /* - * (non-Javadoc) - * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) - */ @Override public boolean supports(Class delimiter) { return repositories.hasRepositoryFor(delimiter); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.EntityLinks#linkFor(java.lang.Class) - */ @Override public LinkBuilder linkFor(Class type) { @@ -109,10 +101,6 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { return new RepositoryLinkBuilder(metadata, new BaseUri(config.getBasePath())); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.EntityLinks#linkFor(java.lang.Class, java.lang.Object[]) - */ @Override public LinkBuilder linkFor(Class type, Object... parameters) { return linkFor(type); @@ -137,19 +125,11 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { return Link.of(UriTemplate.of(href).with(variables), metadata.getRel()); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.EntityLinks#linkToCollectionResource(java.lang.Class) - */ @Override public Link linkToCollectionResource(Class type) { return linkToPagedResource(type, null); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.EntityLinks#linkToItemResource(java.lang.Class, java.lang.Object) - */ @Override public Link linkToItemResource(Class type, Object id) { @@ -162,10 +142,6 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { metadata.getItemResourceRel()); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.core.AbstractEntityLinks#linkForItemResource(java.lang.Class, java.lang.Object) - */ @Override public LinkBuilder linkForItemResource(Class type, Object id) { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryLinkBuilder.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryLinkBuilder.java index 62567ee01..65a010e36 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryLinkBuilder.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryLinkBuilder.java @@ -63,10 +63,6 @@ public class RepositoryLinkBuilder extends LinkBuilderSupport affordances) { return new RepositoryLinkBuilder(this.metadata, components, affordances); } - /* - * (non-Javadoc) - * @see org.springframework.hateoas.server.core.LinkBuilderSupport#getThis() - */ @Override protected RepositoryLinkBuilder getThis() { return this; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/util/InputStreamHttpInputMessage.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/util/InputStreamHttpInputMessage.java index d7daeeed5..8b1185020 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/util/InputStreamHttpInputMessage.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/util/InputStreamHttpInputMessage.java @@ -41,18 +41,10 @@ public class InputStreamHttpInputMessage implements HttpInputMessage { return new InputStreamHttpInputMessage(body); } - /* - * (non-Javadoc) - * @see org.springframework.http.HttpInputMessage#getBody() - */ public InputStream getBody() { return this.body; } - /* - * (non-Javadoc) - * @see org.springframework.http.HttpMessage#getHeaders() - */ @Override public HttpHeaders getHeaders() { return HttpHeaders.EMPTY; diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMappingUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMappingUnitTests.java index b281688c0..440830521 100755 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMappingUnitTests.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMappingUnitTests.java @@ -337,10 +337,6 @@ class RepositoryRestHandlerMappingUnitTests { return super.isHandler(beanType); } - /* - * (non-Javadoc) - * @see org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#getHandlerInternal(jakarta.servlet.http.HttpServletRequest) - */ @Override public HandlerMethod getHandlerInternal(HttpServletRequest request) throws Exception { return super.getHandlerInternal(request); diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RootResourceInformationUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RootResourceInformationUnitTests.java index 2a09b5030..952e3f2b2 100755 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RootResourceInformationUnitTests.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RootResourceInformationUnitTests.java @@ -73,10 +73,6 @@ class RootResourceInformationUnitTests { private static final Answer DEFAULT = Mockito.RETURNS_DEFAULTS; - /* - * (non-Javadoc) - * @see org.mockito.stubbing.Answer#answer(org.mockito.invocation.InvocationOnMock) - */ @Override public Object answer(InvocationOnMock invocation) throws Throwable { diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java index 644c37b56..fddbcc1f7 100755 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java @@ -788,10 +788,6 @@ class DomainObjectReaderUnitTests { private final Map values; - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext) - */ @Override public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2ModuleUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2ModuleUnitTests.java index 15e8c8d00..6fbc4aa48 100755 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2ModuleUnitTests.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2ModuleUnitTests.java @@ -317,10 +317,6 @@ class PersistentEntityJackson2ModuleUnitTests { super(CustomType.class); } - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.ser.std.StdSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(CustomType value, JsonGenerator gen, SerializerProvider provider) throws IOException {