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
72bfd4ce
Commit
72bfd4ce
authored
Dec 17, 2013
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Protect HttpMessageConverters if MVC is not available
parent
5dab07d0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
HttpMessageConverters.java
...amework/boot/autoconfigure/web/HttpMessageConverters.java
+15
-5
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java
View file @
72bfd4ce
...
@@ -25,6 +25,8 @@ import java.util.List;
...
@@ -25,6 +25,8 @@ import java.util.List;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.xml.AbstractXmlHttpMessageConverter
;
import
org.springframework.http.converter.xml.AbstractXmlHttpMessageConverter
;
import
org.springframework.util.ClassUtils
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
;
/**
/**
...
@@ -88,11 +90,19 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
...
@@ -88,11 +90,19 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
private
List
<
HttpMessageConverter
<?>>
getDefaultConverters
()
{
private
List
<
HttpMessageConverter
<?>>
getDefaultConverters
()
{
List
<
HttpMessageConverter
<?>>
converters
=
new
ArrayList
<
HttpMessageConverter
<?>>();
List
<
HttpMessageConverter
<?>>
converters
=
new
ArrayList
<
HttpMessageConverter
<?>>();
converters
.
addAll
(
new
WebMvcConfigurationSupport
()
{
if
(
ClassUtils
public
List
<
HttpMessageConverter
<?>>
defaultMessageConverters
()
{
.
isPresent
(
return
super
.
getMessageConverters
();
"org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport"
,
}
null
))
{
}.
defaultMessageConverters
());
converters
.
addAll
(
new
WebMvcConfigurationSupport
()
{
public
List
<
HttpMessageConverter
<?>>
defaultMessageConverters
()
{
return
super
.
getMessageConverters
();
}
}.
defaultMessageConverters
());
}
else
{
converters
.
addAll
(
new
RestTemplate
().
getMessageConverters
());
}
reorderXmlConvertersToEnd
(
converters
);
reorderXmlConvertersToEnd
(
converters
);
return
converters
;
return
converters
;
}
}
...
...
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