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
7d25948a
Commit
7d25948a
authored
Jul 31, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.2.x' into 2.3.x
Closes gh-22686
parents
29394768
df198a0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
LiquibaseEndpoint.java
...ngframework/boot/actuate/liquibase/LiquibaseEndpoint.java
+2
-2
LiquibaseEndpointTests.java
...mework/boot/actuate/liquibase/LiquibaseEndpointTests.java
+11
-0
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpoint.java
View file @
7d25948a
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -62,7 +62,7 @@ public class LiquibaseEndpoint {
...
@@ -62,7 +62,7 @@ public class LiquibaseEndpoint {
while
(
target
!=
null
)
{
while
(
target
!=
null
)
{
Map
<
String
,
LiquibaseBean
>
liquibaseBeans
=
new
HashMap
<>();
Map
<
String
,
LiquibaseBean
>
liquibaseBeans
=
new
HashMap
<>();
DatabaseFactory
factory
=
DatabaseFactory
.
getInstance
();
DatabaseFactory
factory
=
DatabaseFactory
.
getInstance
();
t
his
.
contex
t
.
getBeansOfType
(
SpringLiquibase
.
class
)
t
arge
t
.
getBeansOfType
(
SpringLiquibase
.
class
)
.
forEach
((
name
,
liquibase
)
->
liquibaseBeans
.
put
(
name
,
createReport
(
liquibase
,
factory
)));
.
forEach
((
name
,
liquibase
)
->
liquibaseBeans
.
put
(
name
,
createReport
(
liquibase
,
factory
)));
ApplicationContext
parent
=
target
.
getParent
();
ApplicationContext
parent
=
target
.
getParent
();
contextBeans
.
put
(
target
.
getId
(),
contextBeans
.
put
(
target
.
getId
(),
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
View file @
7d25948a
...
@@ -62,6 +62,17 @@ class LiquibaseEndpointTests {
...
@@ -62,6 +62,17 @@ class LiquibaseEndpointTests {
});
});
}
}
@Test
void
liquibaseReportIsReturnedForContextHierarchy
()
{
this
.
contextRunner
.
withUserConfiguration
().
run
((
parent
)
->
{
this
.
contextRunner
.
withUserConfiguration
(
Config
.
class
).
withParent
(
parent
).
run
((
context
)
->
{
Map
<
String
,
LiquibaseBean
>
liquibaseBeans
=
context
.
getBean
(
LiquibaseEndpoint
.
class
).
liquibaseBeans
()
.
getContexts
().
get
(
parent
.
getId
()).
getLiquibaseBeans
();
assertThat
(
liquibaseBeans
.
get
(
"liquibase"
).
getChangeSets
()).
hasSize
(
1
);
});
});
}
@Test
@Test
void
invokeWithCustomSchema
()
{
void
invokeWithCustomSchema
()
{
this
.
contextRunner
.
withUserConfiguration
(
Config
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
Config
.
class
)
...
...
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