Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
ad9e8219
Commit
ad9e8219
authored
Sep 01, 2019
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18004 from dreis2211
* pr/18004: Fix duplicated words Closes gh-18004
parents
4f696441
3e35a661
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
FlywayProperties.java
...framework/boot/autoconfigure/flyway/FlywayProperties.java
+1
-1
CapturedOutput.java
.../org/springframework/boot/test/system/CapturedOutput.java
+3
-3
OutputCapture.java
...a/org/springframework/boot/test/system/OutputCapture.java
+3
-3
CapturedOutput.java
...ringframework/boot/testsupport/system/CapturedOutput.java
+3
-3
OutputCapture.java
...pringframework/boot/testsupport/system/OutputCapture.java
+3
-3
NettyReactiveWebServerFactory.java
...oot/web/embedded/netty/NettyReactiveWebServerFactory.java
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View file @
ad9e8219
...
@@ -70,7 +70,7 @@ public class FlywayProperties {
...
@@ -70,7 +70,7 @@ public class FlywayProperties {
private
List
<
String
>
schemas
=
new
ArrayList
<>();
private
List
<
String
>
schemas
=
new
ArrayList
<>();
/**
/**
* Name of the schema
schema
history table that will be used by Flyway.
* Name of the schema history table that will be used by Flyway.
*/
*/
private
String
table
=
"flyway_schema_history"
;
private
String
table
=
"flyway_schema_history"
;
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/CapturedOutput.java
View file @
ad9e8219
...
@@ -51,19 +51,19 @@ public interface CapturedOutput extends CharSequence {
...
@@ -51,19 +51,19 @@ public interface CapturedOutput extends CharSequence {
/**
/**
* Return all content (both {@link System#out System.out} and {@link System#err
* Return all content (both {@link System#out System.out} and {@link System#err
* System.err}) in the order that it was
was
captured.
* System.err}) in the order that it was captured.
* @return all captured output
* @return all captured output
*/
*/
String
getAll
();
String
getAll
();
/**
/**
* Return {@link System#out System.out} content in the order that it was
was
captured.
* Return {@link System#out System.out} content in the order that it was captured.
* @return {@link System#out System.out} captured output
* @return {@link System#out System.out} captured output
*/
*/
String
getOut
();
String
getOut
();
/**
/**
* Return {@link System#err System.err} content in the order that it was
was
captured.
* Return {@link System#err System.err} content in the order that it was captured.
* @return {@link System#err System.err} captured output
* @return {@link System#err System.err} captured output
*/
*/
String
getErr
();
String
getErr
();
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java
View file @
ad9e8219
...
@@ -92,7 +92,7 @@ class OutputCapture implements CapturedOutput {
...
@@ -92,7 +92,7 @@ class OutputCapture implements CapturedOutput {
/**
/**
* Return all content (both {@link System#out System.out} and {@link System#err
* Return all content (both {@link System#out System.out} and {@link System#err
* System.err}) in the order that it was
was
captured.
* System.err}) in the order that it was captured.
* @return all captured output
* @return all captured output
*/
*/
@Override
@Override
...
@@ -101,7 +101,7 @@ class OutputCapture implements CapturedOutput {
...
@@ -101,7 +101,7 @@ class OutputCapture implements CapturedOutput {
}
}
/**
/**
* Return {@link System#out System.out} content in the order that it was
was
captured.
* Return {@link System#out System.out} content in the order that it was captured.
* @return {@link System#out System.out} captured output
* @return {@link System#out System.out} captured output
*/
*/
@Override
@Override
...
@@ -110,7 +110,7 @@ class OutputCapture implements CapturedOutput {
...
@@ -110,7 +110,7 @@ class OutputCapture implements CapturedOutput {
}
}
/**
/**
* Return {@link System#err System.err} content in the order that it was
was
captured.
* Return {@link System#err System.err} content in the order that it was captured.
* @return {@link System#err System.err} captured output
* @return {@link System#err System.err} captured output
*/
*/
@Override
@Override
...
...
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/CapturedOutput.java
View file @
ad9e8219
...
@@ -44,19 +44,19 @@ public interface CapturedOutput extends CharSequence {
...
@@ -44,19 +44,19 @@ public interface CapturedOutput extends CharSequence {
/**
/**
* Return all content (both {@link System#out System.out} and {@link System#err
* Return all content (both {@link System#out System.out} and {@link System#err
* System.err}) in the order that it was
was
captured.
* System.err}) in the order that it was captured.
* @return all captured output
* @return all captured output
*/
*/
String
getAll
();
String
getAll
();
/**
/**
* Return {@link System#out System.out} content in the order that it was
was
captured.
* Return {@link System#out System.out} content in the order that it was captured.
* @return {@link System#out System.out} captured output
* @return {@link System#out System.out} captured output
*/
*/
String
getOut
();
String
getOut
();
/**
/**
* Return {@link System#err System.err} content in the order that it was
was
captured.
* Return {@link System#err System.err} content in the order that it was captured.
* @return {@link System#err System.err} captured output
* @return {@link System#err System.err} captured output
*/
*/
String
getErr
();
String
getErr
();
...
...
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCapture.java
View file @
ad9e8219
...
@@ -77,7 +77,7 @@ class OutputCapture implements CapturedOutput {
...
@@ -77,7 +77,7 @@ class OutputCapture implements CapturedOutput {
/**
/**
* Return all content (both {@link System#out System.out} and {@link System#err
* Return all content (both {@link System#out System.out} and {@link System#err
* System.err}) in the order that it was
was
captured.
* System.err}) in the order that it was captured.
* @return all captured output
* @return all captured output
*/
*/
@Override
@Override
...
@@ -86,7 +86,7 @@ class OutputCapture implements CapturedOutput {
...
@@ -86,7 +86,7 @@ class OutputCapture implements CapturedOutput {
}
}
/**
/**
* Return {@link System#out System.out} content in the order that it was
was
captured.
* Return {@link System#out System.out} content in the order that it was captured.
* @return {@link System#out System.out} captured output
* @return {@link System#out System.out} captured output
*/
*/
@Override
@Override
...
@@ -95,7 +95,7 @@ class OutputCapture implements CapturedOutput {
...
@@ -95,7 +95,7 @@ class OutputCapture implements CapturedOutput {
}
}
/**
/**
* Return {@link System#err System.err} content in the order that it was
was
captured.
* Return {@link System#err System.err} content in the order that it was captured.
* @return {@link System#err System.err} captured output
* @return {@link System#err System.err} captured output
*/
*/
@Override
@Override
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java
View file @
ad9e8219
...
@@ -100,7 +100,7 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
...
@@ -100,7 +100,7 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
}
}
/**
/**
* Add {@link NettyRouteProvider}s that should be applied, in order, before the
the
* Add {@link NettyRouteProvider}s that should be applied, in order, before the
* handler for the Spring application.
* handler for the Spring application.
* @param routeProviders the route providers to add
* @param routeProviders the route providers to add
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment