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
e81abc3f
Commit
e81abc3f
authored
Nov 27, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Order jacksonCodecCustomizer so user-provided customizer can go after it
Closes gh-15167
parent
e6dd1125
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
113 additions
and
1 deletion
+113
-1
CodecsAutoConfiguration.java
...oot/autoconfigure/http/codec/CodecsAutoConfiguration.java
+3
-1
CodecsAutoConfigurationTests.java
...utoconfigure/http/codec/CodecsAutoConfigurationTests.java
+110
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java
View file @
e81abc3f
/*
/*
* Copyright 2012-201
7
the original author or authors.
* Copyright 2012-201
8
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
...
@@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import
org.springframework.boot.web.codec.CodecCustomizer
;
import
org.springframework.boot.web.codec.CodecCustomizer
;
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.core.annotation.Order
;
import
org.springframework.http.codec.CodecConfigurer
;
import
org.springframework.http.codec.CodecConfigurer
;
import
org.springframework.http.codec.json.Jackson2JsonDecoder
;
import
org.springframework.http.codec.json.Jackson2JsonDecoder
;
import
org.springframework.http.codec.json.Jackson2JsonEncoder
;
import
org.springframework.http.codec.json.Jackson2JsonEncoder
;
...
@@ -51,6 +52,7 @@ public class CodecsAutoConfiguration {
...
@@ -51,6 +52,7 @@ public class CodecsAutoConfiguration {
static
class
JacksonCodecConfiguration
{
static
class
JacksonCodecConfiguration
{
@Bean
@Bean
@Order
(
0
)
@ConditionalOnBean
(
ObjectMapper
.
class
)
@ConditionalOnBean
(
ObjectMapper
.
class
)
public
CodecCustomizer
jacksonCodecCustomizer
(
ObjectMapper
objectMapper
)
{
public
CodecCustomizer
jacksonCodecCustomizer
(
ObjectMapper
objectMapper
)
{
return
(
configurer
)
->
{
return
(
configurer
)
->
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfigurationTests.java
0 → 100644
View file @
e81abc3f
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
http
.
codec
;
import
java.util.List
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.junit.Test
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.web.codec.CodecCustomizer
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.codec.CodecConfigurer
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Tests for {@link CodecsAutoConfiguration}.
*
* @author Andy Wilkinson
*/
public
class
CodecsAutoConfigurationTests
{
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
CodecsAutoConfiguration
.
class
));
@Test
public
void
jacksonCodecCustomizerBacksOffWhenThereIsNoObjectMapper
()
{
this
.
contextRunner
.
run
(
(
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
CodecCustomizer
.
class
));
}
@Test
public
void
jacksonCodecCustomizerIsAutoConfiguredWhenObjectMapperIsPresent
()
{
this
.
contextRunner
.
withUserConfiguration
(
ObjectMapperConfiguration
.
class
).
run
(
(
context
)
->
assertThat
(
context
).
hasSingleBean
(
CodecCustomizer
.
class
));
}
@Test
public
void
userProvidedCustomizerCanOverrideJacksonCodecCustomizer
()
{
this
.
contextRunner
.
withUserConfiguration
(
ObjectMapperConfiguration
.
class
,
CodecCustomizerConfiguration
.
class
).
run
((
context
)
->
{
List
<
CodecCustomizer
>
codecCustomizers
=
context
.
getBean
(
CodecCustomizers
.
class
).
codecCustomizers
;
assertThat
(
codecCustomizers
).
hasSize
(
2
);
assertThat
(
codecCustomizers
.
get
(
1
))
.
isInstanceOf
(
TestCodecCustomizer
.
class
);
});
}
@Configuration
static
class
ObjectMapperConfiguration
{
@Bean
ObjectMapper
objectMapper
()
{
return
new
ObjectMapper
();
}
}
@Configuration
static
class
CodecCustomizerConfiguration
{
@Bean
CodecCustomizer
codecCustomizer
()
{
return
new
TestCodecCustomizer
();
}
@Bean
CodecCustomizers
codecCustomizers
(
List
<
CodecCustomizer
>
customizers
)
{
return
new
CodecCustomizers
(
customizers
);
}
}
private
static
final
class
TestCodecCustomizer
implements
CodecCustomizer
{
@Override
public
void
customize
(
CodecConfigurer
configurer
)
{
}
}
private
static
final
class
CodecCustomizers
{
private
final
List
<
CodecCustomizer
>
codecCustomizers
;
private
CodecCustomizers
(
List
<
CodecCustomizer
>
codecCustomizers
)
{
this
.
codecCustomizers
=
codecCustomizers
;
}
}
}
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