Skip to content

Commit cf1a9b4

Browse files
committed
Fix reference to GsonAutoConfiguration
1 parent a92217a commit cf1a9b4

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,6 @@ public void before() {
108108
System.clearProperty("spring.cloud.function.definition");
109109
}
110110

111-
@SuppressWarnings({ "rawtypes", "unchecked" })
112-
@Test
113-
public void testEmptyPojoConversion() {
114-
FunctionCatalog catalog = this.configureCatalog(EmptyPojoConfiguratioin.class);
115-
Function function = catalog.lookup("echo");
116-
String result = (String) function.apply(MessageBuilder.withPayload(new EmptyPojo()).build());
117-
assertThat(result).isEqualTo("{}");
118-
}
119-
120111
@SuppressWarnings({ "rawtypes", "unchecked" })
121112
@Test
122113
public void testCompositionWithNonExistingFunction() throws Exception {

spring-cloud-function-web/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
<artifactId>spring-boot-starter-webflux</artifactId>
6060
<optional>true</optional>
6161
</dependency>
62+
<dependency>
63+
<groupId>org.springframework.boot</groupId>
64+
<artifactId>spring-boot-webflux</artifactId>
65+
<optional>true</optional>
66+
</dependency>
6267
<dependency>
6368
<groupId>org.springframework.boot</groupId>
6469
<artifactId>spring-boot-configuration-processor</artifactId>

spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
27-
import org.springframework.boot.gson.autoconfigure.GsonAutoConfiguration;
28-
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
2927
import org.springframework.cloud.function.context.FunctionCatalog;
3028
import org.springframework.cloud.function.context.FunctionProperties;
3129
import org.springframework.cloud.function.web.BasicStringConverter;
@@ -44,7 +42,7 @@
4442
@ConditionalOnClass({ Flux.class, AsyncHandlerMethodReturnValueHandler.class })
4543
@ConditionalOnWebApplication(type = Type.REACTIVE)
4644
@Import(FunctionController.class)
47-
@AutoConfigureAfter({ JacksonAutoConfiguration.class, GsonAutoConfiguration.class })
45+
@AutoConfigureAfter(name = { "org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration", "org.springframework.boot.gson.autoconfigure.GsonAutoConfiguration" })
4846
public class ReactorAutoConfiguration {
4947

5048
@Bean

0 commit comments

Comments
 (0)