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
32d30a0a
Commit
32d30a0a
authored
Nov 14, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4488 from izeye/polish-20151114
* pr/4488: Polish
parents
e7837a70
903cdf3d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
9 deletions
+9
-9
HttpTunnelServer.java
...amework/boot/devtools/tunnel/server/HttpTunnelServer.java
+1
-1
SpringApplicationTests.java
...java/org/springframework/boot/SpringApplicationTests.java
+2
-2
PoolingConnectionFactoryBeanTests.java
.../boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java
+1
-1
PoolingDataSourceBeanTests.java
...amework/boot/jta/bitronix/PoolingDataSourceBeanTests.java
+1
-1
AbstractLoggingSystemTests.java
...ingframework/boot/logging/AbstractLoggingSystemTests.java
+1
-1
LevelRemappingAppenderTests.java
...ork/boot/logging/logback/LevelRemappingAppenderTests.java
+1
-1
RedisTestServer.java
.../java/org/springframework/boot/redis/RedisTestServer.java
+1
-1
TestRestTemplateTests.java
.../org/springframework/boot/test/TestRestTemplateTests.java
+1
-1
No files found.
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
View file @
32d30a0a
...
...
@@ -375,7 +375,7 @@ public class HttpTunnelServer {
}
/**
* Start asynchronous support or if unavailble return {@code null} to cause
* Start asynchronous support or if unavail
a
ble return {@code null} to cause
* {@link #waitForResponse()} to block.
* @return the async request control
*/
...
...
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View file @
32d30a0a
...
...
@@ -299,13 +299,13 @@ public class SpringApplicationTests {
SpringApplication
application
=
new
SpringApplication
(
ExampleConfig
.
class
);
application
.
setWebEnvironment
(
false
);
final
AtomicReference
<
ApplicationContext
>
reference
=
new
AtomicReference
<
ApplicationContext
>();
class
InitalizerListener
implements
ApplicationListener
<
ContextRefreshedEvent
>
{
class
Init
i
alizerListener
implements
ApplicationListener
<
ContextRefreshedEvent
>
{
@Override
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
reference
.
set
(
event
.
getApplicationContext
());
}
}
application
.
setListeners
(
Arrays
.
asList
(
new
InitalizerListener
()));
application
.
setListeners
(
Arrays
.
asList
(
new
Init
i
alizerListener
()));
this
.
context
=
application
.
run
(
"--foo=bar"
);
assertThat
(
this
.
context
,
sameInstance
(
reference
.
get
()));
// Custom initializers do not switch off the defaults
...
...
spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java
View file @
32d30a0a
...
...
@@ -41,7 +41,7 @@ public class PoolingConnectionFactoryBeanTests {
};
@Test
public
void
sens
bi
leDefaults
()
throws
Exception
{
public
void
sens
ib
leDefaults
()
throws
Exception
{
assertThat
(
this
.
bean
.
getMaxPoolSize
(),
equalTo
(
10
));
assertThat
(
this
.
bean
.
getTestConnections
(),
equalTo
(
true
));
assertThat
(
this
.
bean
.
getAutomaticEnlistingEnabled
(),
equalTo
(
true
));
...
...
spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java
View file @
32d30a0a
...
...
@@ -39,7 +39,7 @@ public class PoolingDataSourceBeanTests {
private
PoolingDataSourceBean
bean
=
new
PoolingDataSourceBean
();
@Test
public
void
sens
bi
leDefaults
()
throws
Exception
{
public
void
sens
ib
leDefaults
()
throws
Exception
{
assertThat
(
this
.
bean
.
getMaxPoolSize
(),
equalTo
(
10
));
assertThat
(
this
.
bean
.
getAutomaticEnlistingEnabled
(),
equalTo
(
true
));
assertThat
(
this
.
bean
.
isEnableJdbc4ConnectionTest
(),
equalTo
(
true
));
...
...
spring-boot/src/test/java/org/springframework/boot/logging/AbstractLoggingSystemTests.java
View file @
32d30a0a
...
...
@@ -41,7 +41,7 @@ public abstract class AbstractLoggingSystemTests {
private
String
originalTempFolder
;
@Before
public
void
configureTemp
d
ir
()
throws
IOException
{
public
void
configureTemp
D
ir
()
throws
IOException
{
this
.
originalTempFolder
=
System
.
getProperty
(
JAVA_IO_TMPDIR
);
System
.
setProperty
(
JAVA_IO_TMPDIR
,
this
.
temp
.
newFolder
().
getAbsolutePath
());
}
...
...
spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java
View file @
32d30a0a
...
...
@@ -70,7 +70,7 @@ public class LevelRemappingAppenderTests {
}
@Test
public
void
defaltRemapsInfo
()
throws
Exception
{
public
void
defa
u
ltRemapsInfo
()
throws
Exception
{
this
.
appender
.
append
(
mockLogEvent
(
Level
.
INFO
));
verify
(
this
.
logger
).
callAppenders
(
this
.
logCaptor
.
capture
());
assertThat
(
this
.
logCaptor
.
getValue
().
getLevel
(),
equalTo
(
Level
.
DEBUG
));
...
...
spring-boot/src/test/java/org/springframework/boot/redis/RedisTestServer.java
View file @
32d30a0a
...
...
@@ -47,7 +47,7 @@ public class RedisTestServer implements TestRule {
return
new
RedisStatement
(
base
,
this
.
connectionFactory
);
}
catch
(
Exception
ex
)
{
logger
.
error
(
"No Redis server availble"
,
ex
);
logger
.
error
(
"No Redis server avail
a
ble"
,
ex
);
return
new
SkipStatement
();
}
}
...
...
spring-boot/src/test/java/org/springframework/boot/test/TestRestTemplateTests.java
View file @
32d30a0a
...
...
@@ -38,7 +38,7 @@ public class TestRestTemplateTests {
@Test
public
void
simple
()
{
// The Apache client is on the classpath so we get the fully-
lead
ed factory
// The Apache client is on the classpath so we get the fully-
fledg
ed factory
assertTrue
(
new
TestRestTemplate
()
.
getRequestFactory
()
instanceof
HttpComponentsClientHttpRequestFactory
);
}
...
...
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