Skip to content

Fix Jackson auto-configuration classpath guard #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ikjeong wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

Fix Jackson auto-configuration classpath guard #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...nfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import feign.http2client.Http2Client;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import tools.jackson.databind.JacksonModule;

import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
Expand Down Expand Up @@ -126,7 +127,7 @@ public Capability cachingCapability(CacheInterceptor cacheInterceptor) {
}

@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ Module.class, Page.class, Sort.class })
@ConditionalOnClass({ JacksonModule.class, Page.class, Sort.class })
@ConditionalOnProperty(value = "spring.cloud.openfeign.autoconfiguration.jackson.enabled", havingValue = "true",
matchIfMissing = true)
protected static class FeignJacksonConfiguration {
Expand Down
18 changes: 18 additions & 0 deletions ...n-core/src/test/java/org/springframework/cloud/openfeign/FeignAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
Expand Down Expand Up @@ -63,6 +64,23 @@ class FeignAutoConfigurationTests {
.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class))
.withPropertyValues("spring.cloud.openfeign.httpclient.hc5.enabled=false");

@Test
void shouldConfigureJacksonModules() {
runner.run(context -> assertThat(context).hasBean("pageJacksonModule").hasBean("sortModule"));
}

@Test
void shouldNotConfigureJacksonModulesWhenJacksonDatabindIsMissing() {
runner.withClassLoader(new FilteredClassLoader("tools.jackson.databind"))
.run(context -> assertThat(context).doesNotHaveBean("pageJacksonModule").doesNotHaveBean("sortModule"));
}

@Test
void shouldNotConfigureJacksonModulesWhenSpringDataIsMissing() {
runner.withClassLoader(new FilteredClassLoader("org.springframework.data"))
.run(context -> assertThat(context).doesNotHaveBean("pageJacksonModule").doesNotHaveBean("sortModule"));
}

@Test
void shouldInstantiateDefaultTargeterWhenFeignCircuitBreakerIsDisabled() {
runner.withPropertyValues("spring.cloud.openfeign.circuitbreaker.enabled=false")
Expand Down