Browse Source

Fix @⁠inheritDoc usage

pull/32412/head
Sam Brannen 2 years ago
parent
commit
3c00637c88
  1. 2
      spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java
  2. 4
      spring-web/src/main/java/org/springframework/http/codec/ClientCodecConfigurer.java
  3. 4
      spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java
  4. 4
      spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java
  5. 4
      spring-web/src/main/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverter.java
  6. 4
      spring-web/src/main/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverter.java
  7. 4
      spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
  8. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java

2
spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java

@ -207,7 +207,7 @@ public class MethodValidationAdapter implements MethodValidator { @@ -207,7 +207,7 @@ public class MethodValidationAdapter implements MethodValidator {
/**
* {@inheritDoc}.
* {@inheritDoc}
* <p>Default are the validation groups as specified in the {@link Validated}
* annotation on the method, or on the containing target class of the method,
* or for an AOP proxy without a target (with all behavior in advisors), also

4
spring-web/src/main/java/org/springframework/http/codec/ClientCodecConfigurer.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -63,7 +63,7 @@ public interface ClientCodecConfigurer extends CodecConfigurer { @@ -63,7 +63,7 @@ public interface ClientCodecConfigurer extends CodecConfigurer {
ClientDefaultCodecs defaultCodecs();
/**
* {@inheritDoc}.
* {@inheritDoc}
*/
@Override
ClientCodecConfigurer clone();

4
spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -63,7 +63,7 @@ public interface ServerCodecConfigurer extends CodecConfigurer { @@ -63,7 +63,7 @@ public interface ServerCodecConfigurer extends CodecConfigurer {
ServerDefaultCodecs defaultCodecs();
/**
* {@inheritDoc}.
* {@inheritDoc}
*/
@Override
ServerCodecConfigurer clone();

4
spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -65,7 +65,7 @@ public class MappingJackson2CborHttpMessageConverter extends AbstractJackson2Htt @@ -65,7 +65,7 @@ public class MappingJackson2CborHttpMessageConverter extends AbstractJackson2Htt
/**
* {@inheritDoc}
* The {@code ObjectMapper} must be configured with a {@code CBORFactory} instance.
* <p>The {@code ObjectMapper} must be configured with a {@code CBORFactory} instance.
*/
@Override
public void setObjectMapper(ObjectMapper objectMapper) {

4
spring-web/src/main/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverter.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -62,7 +62,7 @@ public class MappingJackson2SmileHttpMessageConverter extends AbstractJackson2Ht @@ -62,7 +62,7 @@ public class MappingJackson2SmileHttpMessageConverter extends AbstractJackson2Ht
/**
* {@inheritDoc}
* The {@code ObjectMapper} must be configured with a {@code SmileFactory} instance.
* <p>The {@code ObjectMapper} must be configured with a {@code SmileFactory} instance.
*/
@Override
public void setObjectMapper(ObjectMapper objectMapper) {

4
spring-web/src/main/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverter.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -72,7 +72,7 @@ public class MappingJackson2XmlHttpMessageConverter extends AbstractJackson2Http @@ -72,7 +72,7 @@ public class MappingJackson2XmlHttpMessageConverter extends AbstractJackson2Http
/**
* {@inheritDoc}
* The {@code ObjectMapper} parameter must be a {@link XmlMapper} instance.
* <p>The {@code ObjectMapper} parameter must be an {@link XmlMapper} instance.
*/
@Override
public void setObjectMapper(ObjectMapper objectMapper) {

4
spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -75,7 +75,7 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory { @@ -75,7 +75,7 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory {
}
/**
* {@inheritDoc}.
* {@inheritDoc}
* <p>By default, if the parameter has {@code @Valid}, Bean Validation is
* excluded, deferring to method validation.
*/

2
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java

@ -143,7 +143,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi @@ -143,7 +143,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
/**
* {@inheritDoc}
* Expects a handler to have a type-level @{@link Controller} annotation.
* <p>Expects a handler to have a type-level @{@link Controller} annotation.
*/
@Override
protected boolean isHandler(Class<?> beanType) {

Loading…
Cancel
Save