From fbcebb372c92eacb5f74163da276be41a59ac361 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 27 Apr 2021 16:22:03 +0200 Subject: [PATCH] Switch to a different HalInstantiator constructor for Boot 2.5 compatibility. Fixes gh-536. --- .../cloud/openfeign/hateoas/FeignHalAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java index 219825a8..966b834c 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -73,7 +74,7 @@ public class FeignHalAutoConfiguration { Jackson2HalModule.HalHandlerInstantiator halHandlerInstantiator = new Jackson2HalModule.HalHandlerInstantiator( linkRelationProvider.getIfAvailable(), curieProviderInstance, messageResolver.getIfAvailable(), - configuration); + configuration, new DefaultListableBeanFactory()); mapper.setHandlerInstantiator(halHandlerInstantiator);