Browse Source

Merge pull request #27291 from benelog

* pr/27291:
  Polish "Fix duplicate "the" in Javadoc and XSD"
  Fix duplicate "the" in Javadoc and XSD

Closes gh-27291
pull/27297/head
Stephane Nicoll 3 years ago
parent
commit
4a9c7e631c
  1. 4
      spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
  2. 2
      spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
  3. 2
      spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
  4. 2
      spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
  5. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
  6. 8
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
  7. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
  8. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
  9. 4
      spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
  10. 2
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
  11. 4
      spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd

4
spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 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.
@ -174,7 +174,7 @@ public class ConcurrentLruCache<K, V> { @@ -174,7 +174,7 @@ public class ConcurrentLruCache<K, V> {
}
/**
* Return the the maximum number of entries in the cache
* Return the maximum number of entries in the cache
* (0 indicates no caching, always generating a new value).
* @see #size()
*/

2
spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java

@ -83,7 +83,7 @@ import org.springframework.validation.Validator; @@ -83,7 +83,7 @@ import org.springframework.validation.Validator;
* </ul>
*
* <p>{@link #brokerChannel} delivers messages from within the application to the
* the respective message handlers. {@link #brokerMessagingTemplate} can be injected
* respective message handlers. {@link #brokerMessagingTemplate} can be injected
* into any application component to send messages.
*
* <p>Subclasses are responsible for the parts of the configuration that feed messages

2
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java

@ -59,7 +59,7 @@ public abstract class AbstractDatabaseClientIntegrationTests { @@ -59,7 +59,7 @@ public abstract class AbstractDatabaseClientIntegrationTests {
protected abstract ConnectionFactory createConnectionFactory();
/**
* Return the the CREATE TABLE statement for table {@code legoset} with the following
* Return the CREATE TABLE statement for table {@code legoset} with the following
* three columns:
* <ul>
* <li>id integer (primary key), not null</li>

2
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java

@ -89,7 +89,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests { @@ -89,7 +89,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests {
protected abstract ConnectionFactory createConnectionFactory();
/**
* Return the the CREATE TABLE statement for table {@code legoset} with the following three columns:
* Return the CREATE TABLE statement for table {@code legoset} with the following three columns:
* <ul>
* <li>id integer (primary key), not null</li>
* <li>name varchar(255), nullable</li>

2
spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java

@ -77,7 +77,7 @@ public class HandshakeInfo { @@ -77,7 +77,7 @@ public class HandshakeInfo {
}
/**
* Constructor targeting server-side use with extra information such as the
* Constructor targeting server-side use with extra information such as
* the remote address, attributes, and a log prefix.
* @param uri the endpoint URL
* @param headers server request headers

8
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 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.
@ -87,7 +87,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR @@ -87,7 +87,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
* Variant of {@link #PatternsRequestCondition(String...)} with a
* {@link UrlPathHelper} and a {@link PathMatcher}, and whether to match
* trailing slashes.
* <p>As of 5.3 the the path is obtained through the static method
* <p>As of 5.3 the path is obtained through the static method
* {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
* does not need to be passed in.
* @since 5.2.4
@ -105,7 +105,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR @@ -105,7 +105,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
* Variant of {@link #PatternsRequestCondition(String...)} with a
* {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
* with suffixes and trailing slashes.
* <p>As of 5.3 the the path is obtained through the static method
* <p>As of 5.3 the path is obtained through the static method
* {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
* does not need to be passed in.
* @deprecated as of 5.2.4. See class-level note in
@ -123,7 +123,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR @@ -123,7 +123,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
* Variant of {@link #PatternsRequestCondition(String...)} with a
* {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
* with suffixes and trailing slashes, along with specific extensions.
* <p>As of 5.3 the the path is obtained through the static method
* <p>As of 5.3 the path is obtained through the static method
* {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
* does not need to be passed in.
* @deprecated as of 5.2.4. See class-level note in

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java

@ -47,7 +47,7 @@ import org.springframework.web.util.pattern.PathPattern; @@ -47,7 +47,7 @@ import org.springframework.web.util.pattern.PathPattern;
import org.springframework.web.util.pattern.PathPatternParser;
/**
* Request mapping information. A composite for the the following conditions:
* Request mapping information. A composite for the following conditions:
* <ol>
* <li>{@link PathPatternsRequestCondition} with parsed {@code PathPatterns} or
* {@link PatternsRequestCondition} with String patterns via {@code PathMatcher}

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java

@ -195,7 +195,7 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod { @@ -195,7 +195,7 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
/**
* Create a nested ServletInvocableHandlerMethod subclass that returns the
* the given value (or raises an Exception if the value is one) rather than
* given value (or raises an Exception if the value is one) rather than
* actually invoking the controller method. This is useful when processing
* async return values (e.g. Callable, DeferredResult, ListenableFuture).
*/

4
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 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.
@ -106,7 +106,7 @@ public class SockJsServiceRegistration { @@ -106,7 +106,7 @@ public class SockJsServiceRegistration {
* also be set to point to a URL served by the application.
* <p>Note that it's possible to specify a relative URL in which case the URL
* must be relative to the iframe URL. For example assuming a SockJS endpoint
* mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
* mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
* the relative URL must start with "../../" to traverse up to the location
* above the SockJS mapping. In case of a prefix-based Servlet mapping one more
* traversal may be needed.

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java

@ -153,7 +153,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig @@ -153,7 +153,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
* However, it can also be set to point to a URL served by the application.
* <p>Note that it's possible to specify a relative URL in which case the URL
* must be relative to the iframe URL. For example assuming a SockJS endpoint
* mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
* mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
* the relative URL must start with "../../" to traverse up to the location
* above the SockJS mapping. In case of a prefix-based Servlet mapping one more
* traversal may be needed.

4
spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd

@ -141,8 +141,8 @@ @@ -141,8 +141,8 @@
Note that it's possible to specify a relative URL in which case the URL
must be relative to the iframe URL. For example assuming a SockJS endpoint
mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
The relative URL must start with "../../" to traverse up to the location
mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
the relative URL must start with "../../" to traverse up to the location
above the SockJS mapping. In case of a prefix-based Servlet mapping one more
traversal may be needed.
]]></xsd:documentation>

Loading…
Cancel
Save