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
dac7d9c1
Commit
dac7d9c1
authored
Nov 10, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename AutoConfigurationReportLoggingInitializer to ConditionEvaluationReportLoggingListener
Closes gh-2945
parent
26158c1e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
ConditionEvaluationReportLoggingListener.java
...ure/logging/ConditionEvaluationReportLoggingListener.java
+6
-5
spring.factories
...utoconfigure/src/main/resources/META-INF/spring.factories
+1
-1
ConditionEvaluationReportLoggingListenerTests.java
...ogging/ConditionEvaluationReportLoggingListenerTests.java
+6
-6
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/
AutoConfigurationReportLoggingInitializ
er.java
→
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/
ConditionEvaluationReportLoggingListen
er.java
View file @
dac7d9c1
...
@@ -45,7 +45,7 @@ import org.springframework.core.ResolvableType;
...
@@ -45,7 +45,7 @@ import org.springframework.core.ResolvableType;
* @author Phillip Webb
* @author Phillip Webb
* @author Andy Wilkinson
* @author Andy Wilkinson
*/
*/
public
class
AutoConfigurationReportLoggingInitializ
er
public
class
ConditionEvaluationReportLoggingListen
er
implements
ApplicationContextInitializer
<
ConfigurableApplicationContext
>
{
implements
ApplicationContextInitializer
<
ConfigurableApplicationContext
>
{
private
final
Log
logger
=
LogFactory
.
getLog
(
getClass
());
private
final
Log
logger
=
LogFactory
.
getLog
(
getClass
());
...
@@ -57,7 +57,7 @@ public class AutoConfigurationReportLoggingInitializer
...
@@ -57,7 +57,7 @@ public class AutoConfigurationReportLoggingInitializer
@Override
@Override
public
void
initialize
(
ConfigurableApplicationContext
applicationContext
)
{
public
void
initialize
(
ConfigurableApplicationContext
applicationContext
)
{
this
.
applicationContext
=
applicationContext
;
this
.
applicationContext
=
applicationContext
;
applicationContext
.
addApplicationListener
(
new
AutoConfigur
ationReportListener
());
applicationContext
.
addApplicationListener
(
new
ConditionEvalu
ationReportListener
());
if
(
applicationContext
instanceof
GenericApplicationContext
)
{
if
(
applicationContext
instanceof
GenericApplicationContext
)
{
// Get the report early in case the context fails to load
// Get the report early in case the context fails to load
this
.
report
=
ConditionEvaluationReport
this
.
report
=
ConditionEvaluationReport
...
@@ -66,7 +66,7 @@ public class AutoConfigurationReportLoggingInitializer
...
@@ -66,7 +66,7 @@ public class AutoConfigurationReportLoggingInitializer
}
}
protected
void
onApplicationEvent
(
ApplicationEvent
event
)
{
protected
void
onApplicationEvent
(
ApplicationEvent
event
)
{
ConfigurableApplicationContext
initializerApplicationContext
=
AutoConfigurationReportLoggingInitializer
.
this
.
applicationContext
;
ConfigurableApplicationContext
initializerApplicationContext
=
this
.
applicationContext
;
if
(
event
instanceof
ContextRefreshedEvent
)
{
if
(
event
instanceof
ContextRefreshedEvent
)
{
if
(((
ApplicationContextEvent
)
event
)
if
(((
ApplicationContextEvent
)
event
)
.
getApplicationContext
()
==
initializerApplicationContext
)
{
.
getApplicationContext
()
==
initializerApplicationContext
)
{
...
@@ -109,7 +109,8 @@ public class AutoConfigurationReportLoggingInitializer
...
@@ -109,7 +109,8 @@ public class AutoConfigurationReportLoggingInitializer
}
}
}
}
private
class
AutoConfigurationReportListener
implements
GenericApplicationListener
{
private
class
ConditionEvaluationReportListener
implements
GenericApplicationListener
{
@Override
@Override
public
int
getOrder
()
{
public
int
getOrder
()
{
...
@@ -133,7 +134,7 @@ public class AutoConfigurationReportLoggingInitializer
...
@@ -133,7 +134,7 @@ public class AutoConfigurationReportLoggingInitializer
@Override
@Override
public
void
onApplicationEvent
(
ApplicationEvent
event
)
{
public
void
onApplicationEvent
(
ApplicationEvent
event
)
{
AutoConfigurationReportLoggingInitializ
er
.
this
.
onApplicationEvent
(
event
);
ConditionEvaluationReportLoggingListen
er
.
this
.
onApplicationEvent
(
event
);
}
}
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
View file @
dac7d9c1
# Initializers
# Initializers
org.springframework.context.ApplicationContextInitializer=\
org.springframework.context.ApplicationContextInitializer=\
org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\
org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\
org.springframework.boot.autoconfigure.logging.
AutoConfigurationReportLoggingInitializ
er
org.springframework.boot.autoconfigure.logging.
ConditionEvaluationReportLoggingListen
er
# Application Listeners
# Application Listeners
org.springframework.context.ApplicationListener=\
org.springframework.context.ApplicationListener=\
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/
AutoConfigurationReportLoggingInitializ
erTests.java
→
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/
ConditionEvaluationReportLoggingListen
erTests.java
View file @
dac7d9c1
...
@@ -44,17 +44,17 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -44,17 +44,17 @@ import static org.assertj.core.api.Assertions.assertThat;
import
static
org
.
junit
.
Assert
.
fail
;
import
static
org
.
junit
.
Assert
.
fail
;
/**
/**
* Tests for {@link
AutoConfigurationReportLoggingInitializ
er}.
* Tests for {@link
ConditionEvaluationReportLoggingListen
er}.
*
*
* @author Phillip Webb
* @author Phillip Webb
* @author Andy Wilkinson
* @author Andy Wilkinson
*/
*/
public
class
AutoConfigurationReportLoggingInitializ
erTests
{
public
class
ConditionEvaluationReportLoggingListen
erTests
{
@Rule
@Rule
public
OutputCapture
outputCapture
=
new
OutputCapture
();
public
OutputCapture
outputCapture
=
new
OutputCapture
();
private
AutoConfigurationReportLoggingInitializer
initializer
=
new
AutoConfigurationReportLoggingInitializ
er
();
private
ConditionEvaluationReportLoggingListener
initializer
=
new
ConditionEvaluationReportLoggingListen
er
();
@Test
@Test
public
void
logsDebugOnContextRefresh
()
{
public
void
logsDebugOnContextRefresh
()
{
...
@@ -120,7 +120,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
...
@@ -120,7 +120,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
public
void
canBeUsedInApplicationContext
()
throws
Exception
{
public
void
canBeUsedInApplicationContext
()
throws
Exception
{
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
context
.
register
(
Config
.
class
);
context
.
register
(
Config
.
class
);
new
AutoConfigurationReportLoggingInitializ
er
().
initialize
(
context
);
new
ConditionEvaluationReportLoggingListen
er
().
initialize
(
context
);
context
.
refresh
();
context
.
refresh
();
assertThat
(
context
.
getBean
(
ConditionEvaluationReport
.
class
)).
isNotNull
();
assertThat
(
context
.
getBean
(
ConditionEvaluationReport
.
class
)).
isNotNull
();
}
}
...
@@ -130,7 +130,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
...
@@ -130,7 +130,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
AnnotationConfigWebApplicationContext
context
=
new
AnnotationConfigWebApplicationContext
();
AnnotationConfigWebApplicationContext
context
=
new
AnnotationConfigWebApplicationContext
();
context
.
setServletContext
(
new
MockServletContext
());
context
.
setServletContext
(
new
MockServletContext
());
context
.
register
(
Config
.
class
);
context
.
register
(
Config
.
class
);
new
AutoConfigurationReportLoggingInitializ
er
().
initialize
(
context
);
new
ConditionEvaluationReportLoggingListen
er
().
initialize
(
context
);
context
.
refresh
();
context
.
refresh
();
assertThat
(
context
.
getBean
(
ConditionEvaluationReport
.
class
)).
isNotNull
();
assertThat
(
context
.
getBean
(
ConditionEvaluationReport
.
class
)).
isNotNull
();
}
}
...
@@ -148,7 +148,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
...
@@ -148,7 +148,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
LoggerContext
context
=
(
LoggerContext
)
StaticLoggerBinder
.
getSingleton
()
LoggerContext
context
=
(
LoggerContext
)
StaticLoggerBinder
.
getSingleton
()
.
getLoggerFactory
();
.
getLoggerFactory
();
Logger
logger
=
context
Logger
logger
=
context
.
getLogger
(
AutoConfigurationReportLoggingInitializ
er
.
class
);
.
getLogger
(
ConditionEvaluationReportLoggingListen
er
.
class
);
Level
currentLevel
=
logger
.
getLevel
();
Level
currentLevel
=
logger
.
getLevel
();
logger
.
setLevel
(
Level
.
DEBUG
);
logger
.
setLevel
(
Level
.
DEBUG
);
try
{
try
{
...
...
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