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
c56f30fd
Commit
c56f30fd
authored
Sep 12, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting
parent
c6629866
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
13 deletions
+10
-13
JmsHealthIndicatorTests.java
...ramework/boot/actuate/health/JmsHealthIndicatorTests.java
+2
-4
BatchProperties.java
...ngframework/boot/autoconfigure/batch/BatchProperties.java
+4
-5
SessionProperties.java
...amework/boot/autoconfigure/session/SessionProperties.java
+4
-4
No files found.
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java
View file @
c56f30fd
...
...
@@ -86,10 +86,8 @@ public class JmsHealthIndicatorTests {
given
(
connectionMetaData
.
getJMSProviderName
()).
willReturn
(
"JMS test provider"
);
Connection
connection
=
mock
(
Connection
.
class
);
given
(
connection
.
getMetaData
()).
willReturn
(
connectionMetaData
);
willThrow
(
new
JMSException
(
"Could not start"
,
"123"
))
.
given
(
connection
).
start
();
given
(
connectionFactory
.
createConnection
())
.
willReturn
(
connection
);
willThrow
(
new
JMSException
(
"Could not start"
,
"123"
)).
given
(
connection
).
start
();
given
(
connectionFactory
.
createConnection
()).
willReturn
(
connection
);
JmsHealthIndicator
indicator
=
new
JmsHealthIndicator
(
connectionFactory
);
Health
health
=
indicator
.
health
();
assertThat
(
health
.
getStatus
()).
isEqualTo
(
Status
.
DOWN
);
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
View file @
c56f30fd
...
...
@@ -73,9 +73,8 @@ public class BatchProperties {
public
class
Initializer
{
/**
* Create the required batch tables on startup if necessary. Enabled
* automatically if no custom table prefix is set or if a custom schema is
* configured.
* Create the required batch tables on startup if necessary. Enabled automatically
* if no custom table prefix is set or if a custom schema is configured.
*/
private
Boolean
enabled
;
...
...
@@ -84,8 +83,8 @@ public class BatchProperties {
return
this
.
enabled
;
}
boolean
defaultTablePrefix
=
BatchProperties
.
this
.
getTablePrefix
()
==
null
;
boolean
customSchema
=
!
DEFAULT_SCHEMA_LOCATION
.
equals
(
BatchProperties
.
this
.
getSchema
());
boolean
customSchema
=
!
DEFAULT_SCHEMA_LOCATION
.
equals
(
BatchProperties
.
this
.
getSchema
());
return
(
defaultTablePrefix
||
customSchema
);
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java
View file @
c56f30fd
...
...
@@ -154,10 +154,10 @@ public class SessionProperties {
if
(
this
.
enabled
!=
null
)
{
return
this
.
enabled
;
}
boolean
defaultTableName
=
DEFAULT_TABLE_NAME
.
equals
(
Jdbc
.
this
.
getTableName
());
boolean
customSchema
=
!
DEFAULT_SCHEMA_LOCATION
.
equals
(
Jdbc
.
this
.
getSchema
());
boolean
defaultTableName
=
DEFAULT_TABLE_NAME
.
equals
(
Jdbc
.
this
.
getTableName
());
boolean
customSchema
=
!
DEFAULT_SCHEMA_LOCATION
.
equals
(
Jdbc
.
this
.
getSchema
());
return
(
defaultTableName
||
customSchema
);
}
...
...
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