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
32128a6a
Commit
32128a6a
authored
Jul 27, 2015
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
7fc7e476
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
JacksonAutoConfiguration.java
.../boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+2
-10
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View file @
32128a6a
...
@@ -36,7 +36,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
...
@@ -36,7 +36,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextAware
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.context.annotation.Primary
;
...
@@ -72,9 +71,6 @@ import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
...
@@ -72,9 +71,6 @@ import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
@ConditionalOnClass
(
ObjectMapper
.
class
)
@ConditionalOnClass
(
ObjectMapper
.
class
)
public
class
JacksonAutoConfiguration
{
public
class
JacksonAutoConfiguration
{
@Autowired
private
ListableBeanFactory
beanFactory
;
@Configuration
@Configuration
@ConditionalOnClass
({
ObjectMapper
.
class
,
Jackson2ObjectMapperBuilder
.
class
})
@ConditionalOnClass
({
ObjectMapper
.
class
,
Jackson2ObjectMapperBuilder
.
class
})
static
class
JacksonObjectMapperConfiguration
{
static
class
JacksonObjectMapperConfiguration
{
...
@@ -136,9 +132,9 @@ public class JacksonAutoConfiguration {
...
@@ -136,9 +132,9 @@ public class JacksonAutoConfiguration {
@Configuration
@Configuration
@ConditionalOnClass
({
ObjectMapper
.
class
,
Jackson2ObjectMapperBuilder
.
class
})
@ConditionalOnClass
({
ObjectMapper
.
class
,
Jackson2ObjectMapperBuilder
.
class
})
@EnableConfigurationProperties
(
JacksonProperties
.
class
)
@EnableConfigurationProperties
(
JacksonProperties
.
class
)
static
class
JacksonObjectMapperBuilderConfiguration
implements
static
class
JacksonObjectMapperBuilderConfiguration
{
ApplicationContextAware
{
@Autowired
private
ApplicationContext
applicationContext
;
private
ApplicationContext
applicationContext
;
@Autowired
@Autowired
...
@@ -253,10 +249,6 @@ public class JacksonAutoConfiguration {
...
@@ -253,10 +249,6 @@ public class JacksonAutoConfiguration {
.
values
();
.
values
();
}
}
@Override
public
void
setApplicationContext
(
ApplicationContext
applicationContext
)
{
this
.
applicationContext
=
applicationContext
;
}
}
}
}
}
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