root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11073 from dreis2211:fix-duplicate-words 

* pr/11073:
  Remove duplicate words
This commit is contained in:
Stephane Nicoll 2017-11-18 09:17:50 +01:00
parent c4070e093c 23da409b31
commit 382267d6ef
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java
View File

@ -21,8 +21,8 @@ import java.util.regex.Pattern;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* Strategy that be be used by endpoint implementations to sanitize potentially sensitive * Strategy that should be used by endpoint implementations to sanitize potentially
* keys. * sensitive keys.
* *
* @author Christian Dupuis * @author Christian Dupuis
* @author Toshiaki Maki * @author Toshiaki Maki

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointExtension.java
View File

@ -30,7 +30,7 @@ import org.springframework.core.annotation.AliasFor;
* Meta-annotation used to indicate that an annotation provides extension support for an * Meta-annotation used to indicate that an annotation provides extension support for an
* endpoint. Extensions allow additional technology specific {@link Operation operations} * endpoint. Extensions allow additional technology specific {@link Operation operations}
* to be added to an existing endpoint. For example, a web extension may offer variations * to be added to an existing endpoint. For example, a web extension may offer variations
* of a read operation operation to support filtering based on a query parameter. * of a read operation to support filtering based on a query parameter.
* <p> * <p>
* Extension annotations must provide an {@link EndpointFilter} to restrict when the * Extension annotations must provide an {@link EndpointFilter} to restrict when the
* extension applies. The {@code endpoint} attribute is usually re-declared using * extension applies. The {@code endpoint} attribute is usually re-declared using

4
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -5524,7 +5524,7 @@ Spring Boot offers several conveniences for working with the Quartz scheduler, i
the `spring-boot-starter-quartz` '`Starter`'. If Quartz is available, a `Scheduler` is the `spring-boot-starter-quartz` '`Starter`'. If Quartz is available, a `Scheduler` is
auto-configured (via the `SchedulerFactoryBean` abstraction). auto-configured (via the `SchedulerFactoryBean` abstraction).
Beans of the following types are automatically picked up and associated with the the Beans of the following types are automatically picked up and associated with the
`Scheduler`: `Scheduler`:
* `JobDetail`: defines a particular Job. `JobDetail` instances can be built with the * `JobDetail`: defines a particular Job. `JobDetail` instances can be built with the
@ -6683,7 +6683,7 @@ If you <<using-boot-structuring-your-code, structure your code>> in a sensible w
the configuration of your tests. the configuration of your tests.
It then becomes important not to litter the application's main class with configuration It then becomes important not to litter the application's main class with configuration
settings that are are specific to a particular area of its functionality. settings that are specific to a particular area of its functionality.
Assume that you are using Spring Batch and you rely on the auto-configuration for it. Assume that you are using Spring Batch and you rely on the auto-configuration for it.
Your could define your `@SpringBootApplication` as follows: Your could define your `@SpringBootApplication` as follows:

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/AbstractConfigurableWebServerFactory.java
View File

@ -72,7 +72,7 @@ public class AbstractConfigurableWebServerFactory
} }
/** /**
* The port that the web server server listens on. * The port that the web server listens on.
* @return the port * @return the port
*/ */
public int getPort() { public int getPort() {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerInitializedEvent.java
View File

@ -45,7 +45,7 @@ public class ServletWebServerInitializedEvent extends WebServerInitializedEvent
/** /**
* Access the application context that the server was created in. Sometimes it is * Access the application context that the server was created in. Sometimes it is
* prudent to check that this matches expectations (like being equal to the current * prudent to check that this matches expectations (like being equal to the current
* context) before acting on the server server itself. * context) before acting on the server itself.
* @return the applicationContext that the server was created from * @return the applicationContext that the server was created from
*/ */
@Override @Override