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
f73714bd
Commit
f73714bd
authored
Mar 23, 2017
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not filter HttpMessageConverters in WebMvcTest
Closes gh-8617
parent
dfe26aac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
WebMvcTypeExcludeFilter.java
...st/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java
+2
-0
WebMvcTypeExcludeFilterTests.java
...toconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
+10
-0
No files found.
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java
View file @
f73714bd
...
...
@@ -29,6 +29,7 @@ import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBea
import
org.springframework.boot.web.servlet.FilterRegistrationBean
;
import
org.springframework.context.annotation.ComponentScan.Filter
;
import
org.springframework.core.annotation.AnnotatedElementUtils
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
...
...
@@ -53,6 +54,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
includes
.
add
(
FilterRegistrationBean
.
class
);
includes
.
add
(
DelegatingFilterProxyRegistrationBean
.
class
);
includes
.
add
(
HandlerMethodArgumentResolver
.
class
);
includes
.
add
(
HttpMessageConverter
.
class
);
includes
.
add
(
ErrorAttributes
.
class
);
DEFAULT_INCLUDES
=
Collections
.
unmodifiableSet
(
includes
);
};
...
...
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
View file @
f73714bd
...
...
@@ -25,6 +25,7 @@ import org.springframework.context.annotation.FilterType;
import
org.springframework.core.type.classreading.MetadataReader
;
import
org.springframework.core.type.classreading.MetadataReaderFactory
;
import
org.springframework.core.type.classreading.SimpleMetadataReaderFactory
;
import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Service
;
...
...
@@ -50,6 +51,7 @@ public class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
Controller2
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleControllerAdvice
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleWeb
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleMessageConverter
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
}
...
...
@@ -62,6 +64,7 @@ public class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
Controller2
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleControllerAdvice
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleWeb
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleMessageConverter
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
}
...
...
@@ -74,6 +77,7 @@ public class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
Controller2
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleControllerAdvice
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleWeb
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleMessageConverter
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
}
...
...
@@ -86,6 +90,7 @@ public class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
Controller2
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleControllerAdvice
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleWeb
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleMessageConverter
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isFalse
();
}
...
...
@@ -98,6 +103,7 @@ public class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
Controller2
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleControllerAdvice
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleWeb
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleMessageConverter
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
}
...
...
@@ -153,6 +159,10 @@ public class WebMvcTypeExcludeFilterTests {
}
static
class
ExampleMessageConverter
extends
MappingJackson2HttpMessageConverter
{
}
@Service
static
class
ExampleService
{
...
...
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