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
f234d9c0
Commit
f234d9c0
authored
Nov 27, 2019
by
Johnny Lim
Committed by
Stephane Nicoll
Nov 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ConditionEvaluationReportLoggingListener usage if possible
See gh-19159
parent
ce16c9e9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
34 deletions
+19
-34
CloudFoundryInfoEndpointWebExtensionTests.java
...ry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java
+7
-10
AbstractEndpointRequestIntegrationTests.java
...rity/servlet/AbstractEndpointRequestIntegrationTests.java
+6
-9
NonAspectJAopAutoConfigurationTests.java
...utoconfigure/aop/NonAspectJAopAutoConfigurationTests.java
+5
-8
MongoDataAutoConfigurationTests.java
...configure/data/mongo/MongoDataAutoConfigurationTests.java
+1
-4
JerseyAutoConfigurationTests.java
...ot/autoconfigure/jersey/JerseyAutoConfigurationTests.java
+0
-3
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java
View file @
f234d9c0
...
@@ -31,12 +31,10 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
...
@@ -31,12 +31,10 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
import
org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration
;
import
org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration
;
import
org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration
;
import
org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
;
import
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
@@ -62,14 +60,13 @@ class CloudFoundryInfoEndpointWebExtensionTests {
...
@@ -62,14 +60,13 @@ class CloudFoundryInfoEndpointWebExtensionTests {
@Test
@Test
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
void
gitFullDetailsAlwaysPresent
()
{
void
gitFullDetailsAlwaysPresent
()
{
this
.
contextRunner
.
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
))
this
.
contextRunner
.
run
((
context
)
->
{
.
run
((
context
)
->
{
CloudFoundryInfoEndpointWebExtension
extension
=
context
CloudFoundryInfoEndpointWebExtension
extension
=
context
.
getBean
(
CloudFoundryInfoEndpointWebExtension
.
class
);
.
getBean
(
CloudFoundryInfoEndpointWebExtension
.
class
);
Map
<
String
,
Object
>
git
=
(
Map
<
String
,
Object
>)
extension
.
info
().
get
(
"git"
);
Map
<
String
,
Object
>
git
=
(
Map
<
String
,
Object
>)
extension
.
info
().
get
(
"git"
);
Map
<
String
,
Object
>
commit
=
(
Map
<
String
,
Object
>)
git
.
get
(
"commit"
);
Map
<
String
,
Object
>
commit
=
(
Map
<
String
,
Object
>)
git
.
get
(
"commit"
);
assertThat
(
commit
).
hasSize
(
4
);
assertThat
(
commit
).
hasSize
(
4
);
});
});
}
}
}
}
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java
View file @
f234d9c0
...
@@ -30,10 +30,8 @@ import org.springframework.boot.actuate.endpoint.web.EndpointServlet;
...
@@ -30,10 +30,8 @@ import org.springframework.boot.actuate.endpoint.web.EndpointServlet;
import
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpoint
;
import
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpoint
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
;
import
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
;
import
org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.test.context.assertj.AssertableWebApplicationContext
;
import
org.springframework.boot.test.context.assertj.AssertableWebApplicationContext
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
;
import
org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
;
...
@@ -60,13 +58,12 @@ abstract class AbstractEndpointRequestIntegrationTests {
...
@@ -60,13 +58,12 @@ abstract class AbstractEndpointRequestIntegrationTests {
@Test
@Test
void
toAllEndpointsShouldMatch
()
{
void
toAllEndpointsShouldMatch
()
{
getContextRunner
().
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
))
getContextRunner
().
withPropertyValues
(
"spring.security.user.password=password"
).
run
((
context
)
->
{
.
withPropertyValues
(
"spring.security.user.password=password"
).
run
((
context
)
->
{
WebTestClient
webTestClient
=
getWebTestClient
(
context
);
WebTestClient
webTestClient
=
getWebTestClient
(
context
);
webTestClient
.
get
().
uri
(
"/actuator/e2"
).
exchange
().
expectStatus
().
isUnauthorized
();
webTestClient
.
get
().
uri
(
"/actuator/e2"
).
exchange
().
expectStatus
().
isUnauthorized
();
webTestClient
.
get
().
uri
(
"/actuator/e2"
).
header
(
"Authorization"
,
getBasicAuth
()).
exchange
().
expectStatus
()
webTestClient
.
get
().
uri
(
"/actuator/e2"
).
header
(
"Authorization"
,
getBasicAuth
()).
exchange
()
.
isOk
();
.
expectStatus
().
isOk
();
});
});
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/NonAspectJAopAutoConfigurationTests.java
View file @
f234d9c0
...
@@ -21,8 +21,6 @@ import org.junit.jupiter.api.Test;
...
@@ -21,8 +21,6 @@ import org.junit.jupiter.api.Test;
import
org.springframework.aop.config.AopConfigUtils
;
import
org.springframework.aop.config.AopConfigUtils
;
import
org.springframework.beans.factory.config.BeanDefinition
;
import
org.springframework.beans.factory.config.BeanDefinition
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.classpath.ClassPathExclusions
;
import
org.springframework.boot.testsupport.classpath.ClassPathExclusions
;
...
@@ -41,12 +39,11 @@ class NonAspectJAopAutoConfigurationTests {
...
@@ -41,12 +39,11 @@ class NonAspectJAopAutoConfigurationTests {
@Test
@Test
void
whenAspectJIsAbsentAndProxyTargetClassIsEnabledProxyCreatorBeanIsDefined
()
{
void
whenAspectJIsAbsentAndProxyTargetClassIsEnabledProxyCreatorBeanIsDefined
()
{
this
.
contextRunner
.
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
))
this
.
contextRunner
.
run
((
context
)
->
{
.
run
((
context
)
->
{
BeanDefinition
autoProxyCreator
=
context
.
getBeanFactory
()
BeanDefinition
autoProxyCreator
=
context
.
getBeanFactory
()
.
getBeanDefinition
(
AopConfigUtils
.
AUTO_PROXY_CREATOR_BEAN_NAME
);
.
getBeanDefinition
(
AopConfigUtils
.
AUTO_PROXY_CREATOR_BEAN_NAME
);
assertThat
(
autoProxyCreator
.
getPropertyValues
().
get
(
"proxyTargetClass"
)).
isEqualTo
(
Boolean
.
TRUE
);
assertThat
(
autoProxyCreator
.
getPropertyValues
().
get
(
"proxyTargetClass"
)).
isEqualTo
(
Boolean
.
TRUE
);
});
});
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java
View file @
f234d9c0
...
@@ -31,9 +31,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
...
@@ -31,9 +31,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
import
org.springframework.boot.autoconfigure.data.mongo.city.City
;
import
org.springframework.boot.autoconfigure.data.mongo.city.City
;
import
org.springframework.boot.autoconfigure.data.mongo.country.Country
;
import
org.springframework.boot.autoconfigure.data.mongo.country.Country
;
import
org.springframework.boot.autoconfigure.domain.EntityScan
;
import
org.springframework.boot.autoconfigure.domain.EntityScan
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration
;
import
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
...
@@ -65,8 +63,7 @@ class MongoDataAutoConfigurationTests {
...
@@ -65,8 +63,7 @@ class MongoDataAutoConfigurationTests {
private
final
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
private
final
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
PropertyPlaceholderAutoConfiguration
.
class
,
.
withConfiguration
(
AutoConfigurations
.
of
(
PropertyPlaceholderAutoConfiguration
.
class
,
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
))
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
));
.
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
));
@Test
@Test
void
templateExists
()
{
void
templateExists
()
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java
View file @
f234d9c0
...
@@ -23,8 +23,6 @@ import org.junit.jupiter.api.Test;
...
@@ -23,8 +23,6 @@ import org.junit.jupiter.api.Test;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
;
import
org.springframework.boot.logging.LogLevel
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.web.servlet.FilterRegistrationBean
;
import
org.springframework.boot.web.servlet.FilterRegistrationBean
;
...
@@ -43,7 +41,6 @@ class JerseyAutoConfigurationTests {
...
@@ -43,7 +41,6 @@ class JerseyAutoConfigurationTests {
private
final
WebApplicationContextRunner
contextRunner
=
new
WebApplicationContextRunner
()
private
final
WebApplicationContextRunner
contextRunner
=
new
WebApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
JerseyAutoConfiguration
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
JerseyAutoConfiguration
.
class
))
.
withInitializer
(
new
ConditionEvaluationReportLoggingListener
(
LogLevel
.
INFO
))
.
withUserConfiguration
(
ResourceConfigConfiguration
.
class
);
.
withUserConfiguration
(
ResourceConfigConfiguration
.
class
);
@Test
@Test
...
...
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