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
7d60d023
Commit
7d60d023
authored
Dec 22, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11394 from dreis2211:fix-behavior-spelling
* pr/11394: Align 'behavior' spelling to style guide
parents
7c0ed898
00d12c5b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
15 deletions
+15
-15
AbstractDevToolsDataSourceAutoConfigurationTests.java
...ure/AbstractDevToolsDataSourceAutoConfigurationTests.java
+3
-3
DevToolsEmbeddedDataSourceAutoConfigurationTests.java
...ure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java
+1
-1
DevToolsPooledDataSourceAutoConfigurationTests.java
...igure/DevToolsPooledDataSourceAutoConfigurationTests.java
+8
-8
DuplicateJsonObjectContextCustomizerFactory.java
...est/json/DuplicateJsonObjectContextCustomizerFactory.java
+1
-1
repackage-classifier.apt.vm
...-plugin/src/site/apt/examples/repackage-classifier.apt.vm
+1
-1
ServletWebServerApplicationContext.java
...b/servlet/context/ServletWebServerApplicationContext.java
+1
-1
No files found.
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
View file @
7d60d023
...
@@ -56,7 +56,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
...
@@ -56,7 +56,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
DataSourcePropertiesConfiguration
.
class
,
DataSourcePropertiesConfiguration
.
class
,
SingleDataSourceConfiguration
.
class
);
SingleDataSourceConfiguration
.
class
);
DataSource
dataSource
=
context
.
getBean
(
DataSource
.
class
);
DataSource
dataSource
=
context
.
getBean
(
DataSource
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
dataSource
);
Statement
statement
=
configureDataSourceBehavior
(
dataSource
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
}
}
...
@@ -68,7 +68,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
...
@@ -68,7 +68,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
Collection
<
DataSource
>
dataSources
=
context
.
getBeansOfType
(
DataSource
.
class
)
Collection
<
DataSource
>
dataSources
=
context
.
getBeansOfType
(
DataSource
.
class
)
.
values
();
.
values
();
for
(
DataSource
dataSource
:
dataSources
)
{
for
(
DataSource
dataSource
:
dataSources
)
{
Statement
statement
=
configureDataSourceBehavio
u
r
(
dataSource
);
Statement
statement
=
configureDataSourceBehavior
(
dataSource
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
}
}
}
}
...
@@ -86,7 +86,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
...
@@ -86,7 +86,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
context
.
close
();
context
.
close
();
}
}
protected
final
Statement
configureDataSourceBehavio
u
r
(
DataSource
dataSource
)
protected
final
Statement
configureDataSourceBehavior
(
DataSource
dataSource
)
throws
SQLException
{
throws
SQLException
{
Connection
connection
=
mock
(
Connection
.
class
);
Connection
connection
=
mock
(
Connection
.
class
);
Statement
statement
=
mock
(
Statement
.
class
);
Statement
statement
=
mock
(
Statement
.
class
);
...
...
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java
View file @
7d60d023
...
@@ -46,7 +46,7 @@ public class DevToolsEmbeddedDataSourceAutoConfigurationTests
...
@@ -46,7 +46,7 @@ public class DevToolsEmbeddedDataSourceAutoConfigurationTests
public
void
autoConfiguredDataSourceIsNotShutdown
()
throws
SQLException
{
public
void
autoConfiguredDataSourceIsNotShutdown
()
throws
SQLException
{
ConfigurableApplicationContext
context
=
createContext
(
ConfigurableApplicationContext
context
=
createContext
(
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
...
...
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsPooledDataSourceAutoConfigurationTests.java
View file @
7d60d023
...
@@ -53,7 +53,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -53,7 +53,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
public
void
autoConfiguredInMemoryDataSourceIsShutdown
()
throws
SQLException
{
public
void
autoConfiguredInMemoryDataSourceIsShutdown
()
throws
SQLException
{
ConfigurableApplicationContext
context
=
createContext
(
ConfigurableApplicationContext
context
=
createContext
(
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
).
execute
(
"SHUTDOWN"
);
verify
(
statement
).
execute
(
"SHUTDOWN"
);
...
@@ -63,7 +63,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -63,7 +63,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
public
void
autoConfiguredExternalDataSourceIsNotShutdown
()
throws
SQLException
{
public
void
autoConfiguredExternalDataSourceIsNotShutdown
()
throws
SQLException
{
ConfigurableApplicationContext
context
=
createContext
(
"org.postgresql.Driver"
,
ConfigurableApplicationContext
context
=
createContext
(
"org.postgresql.Driver"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
...
@@ -74,7 +74,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -74,7 +74,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
ConfigurableApplicationContext
context
=
createContext
(
"org.h2.Driver"
,
ConfigurableApplicationContext
context
=
createContext
(
"org.h2.Driver"
,
"jdbc:h2:hsql://localhost"
,
DataSourceAutoConfiguration
.
class
,
"jdbc:h2:hsql://localhost"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
...
@@ -85,7 +85,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -85,7 +85,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
ConfigurableApplicationContext
context
=
createContext
(
"org.h2.Driver"
,
ConfigurableApplicationContext
context
=
createContext
(
"org.h2.Driver"
,
"jdbc:h2:mem:test"
,
DataSourceAutoConfiguration
.
class
,
"jdbc:h2:mem:test"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
1
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
1
)).
execute
(
"SHUTDOWN"
);
...
@@ -96,7 +96,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -96,7 +96,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
ConfigurableApplicationContext
context
=
createContext
(
"org.hsqldb.jdbcDriver"
,
ConfigurableApplicationContext
context
=
createContext
(
"org.hsqldb.jdbcDriver"
,
"jdbc:hsqldb:hsql://localhost"
,
DataSourceAutoConfiguration
.
class
,
"jdbc:hsqldb:hsql://localhost"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
...
@@ -107,7 +107,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -107,7 +107,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
ConfigurableApplicationContext
context
=
createContext
(
"org.hsqldb.jdbcDriver"
,
ConfigurableApplicationContext
context
=
createContext
(
"org.hsqldb.jdbcDriver"
,
"jdbc:hsqldb:mem:test"
,
DataSourceAutoConfiguration
.
class
,
"jdbc:hsqldb:mem:test"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
1
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
1
)).
execute
(
"SHUTDOWN"
);
...
@@ -118,7 +118,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -118,7 +118,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
ConfigurableApplicationContext
context
=
createContext
(
ConfigurableApplicationContext
context
=
createContext
(
"org.apache.derby.jdbc.ClientDriver"
,
"jdbc:derby://localhost"
,
"org.apache.derby.jdbc.ClientDriver"
,
"jdbc:derby://localhost"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
0
)).
execute
(
"SHUTDOWN"
);
...
@@ -129,7 +129,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
...
@@ -129,7 +129,7 @@ public class DevToolsPooledDataSourceAutoConfigurationTests
ConfigurableApplicationContext
context
=
createContext
(
ConfigurableApplicationContext
context
=
createContext
(
"org.apache.derby.jdbc.EmbeddedDriver"
,
"jdbc:derby:memory:test"
,
"org.apache.derby.jdbc.EmbeddedDriver"
,
"jdbc:derby:memory:test"
,
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
DataSourceAutoConfiguration
.
class
,
DataSourceSpyConfiguration
.
class
);
Statement
statement
=
configureDataSourceBehavio
u
r
(
Statement
statement
=
configureDataSourceBehavior
(
context
.
getBean
(
DataSource
.
class
));
context
.
getBean
(
DataSource
.
class
));
context
.
close
();
context
.
close
();
verify
(
statement
,
times
(
1
)).
execute
(
"SHUTDOWN"
);
verify
(
statement
,
times
(
1
)).
execute
(
"SHUTDOWN"
);
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
View file @
7d60d023
...
@@ -81,7 +81,7 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
...
@@ -81,7 +81,7 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
message
.
append
(
"\t"
+
jsonObject
+
"\n"
);
message
.
append
(
"\t"
+
jsonObject
+
"\n"
);
}
}
message
.
append
(
"\nYou may wish to exclude one of them to ensure"
message
.
append
(
"\nYou may wish to exclude one of them to ensure"
+
" predictable runtime behavio
u
r\n"
);
+
" predictable runtime behavior\n"
);
this
.
logger
.
warn
(
message
);
this
.
logger
.
warn
(
message
);
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-classifier.apt.vm
View file @
7d60d023
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-----
-----
By default, the <<<repackage>>> goal will replace the original artifact with the
By default, the <<<repackage>>> goal will replace the original artifact with the
repackaged one. That's a sane behavio
u
r for modules that represent an app but if
repackaged one. That's a sane behavior for modules that represent an app but if
your module is used as a dependency of another module, you need to provide a
your module is used as a dependency of another module, you need to provide a
classifier for the repackaged one.
classifier for the repackaged one.
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
View file @
7d60d023
...
@@ -95,7 +95,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
...
@@ -95,7 +95,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
/**
/**
* Constant value for the DispatcherServlet bean name. A Servlet bean with this name
* Constant value for the DispatcherServlet bean name. A Servlet bean with this name
* is deemed to be the "main" servlet and is automatically given a mapping of "/" by
* is deemed to be the "main" servlet and is automatically given a mapping of "/" by
* default. To change the default behavio
u
r you can use a
* default. To change the default behavior you can use a
* {@link ServletRegistrationBean} or a different bean name.
* {@link ServletRegistrationBean} or a different bean name.
*/
*/
public
static
final
String
DISPATCHER_SERVLET_NAME
=
"dispatcherServlet"
;
public
static
final
String
DISPATCHER_SERVLET_NAME
=
"dispatcherServlet"
;
...
...
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