Skip to content

Commit

Permalink
Fix JacksonJsonpMapper bean autoconfigure condition bug.
Browse files Browse the repository at this point in the history
Fix #36107.
  • Loading branch information
Pengfei-Lu committed Jun 29, 2023
1 parent 7d019c6 commit a65bd83
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -44,7 +45,7 @@
class ElasticsearchClientConfigurations {

@ConditionalOnMissingBean(JsonpMapper.class)
@ConditionalOnBean(ObjectMapper.class)
@ConditionalOnClass(ObjectMapper.class)
@Configuration(proxyBeanMethods = false)
static class JacksonJsonpMapperConfiguration {

Expand Down

0 comments on commit a65bd83

Please sign in to comment.