Skip to content

Commit 20eb4cd

Browse files
committed
Migrate to Jackson 3
1 parent 9ef881d commit 20eb4cd

File tree

25 files changed

+83
-1295
lines changed

25 files changed

+83
-1295
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@
181181
<module>spring-cloud-starter-function-web</module>
182182
<module>spring-cloud-starter-function-webflux</module>
183183
<module>spring-cloud-function-samples</module>
184-
<module>spring-cloud-function-deployer</module>
184+
<!-- <module>spring-cloud-function-deployer</module> -->
185185
<module>spring-cloud-function-adapters</module>
186186
<module>spring-cloud-function-integration</module>
187-
<module>spring-cloud-function-rsocket</module>
187+
<!-- <module>spring-cloud-function-rsocket</module> -->
188188
<module>spring-cloud-function-kotlin</module>
189189
<module>docs</module>
190190
</modules>
@@ -224,10 +224,10 @@
224224
<module>spring-cloud-starter-function-web</module>
225225
<module>spring-cloud-starter-function-webflux</module>
226226
<module>spring-cloud-function-samples</module>
227-
<module>spring-cloud-function-deployer</module>
227+
<!-- <module>spring-cloud-function-deployer</module> -->
228228
<module>spring-cloud-function-adapters</module>
229229
<module>spring-cloud-function-integration</module>
230-
<module>spring-cloud-function-rsocket</module>
230+
<!-- <module>spring-cloud-function-rsocket</module> -->
231231
<module>spring-cloud-function-kotlin</module>
232232
<module>docs</module>
233233
</modules>

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.cloud.function.adapter.aws;
1818

19-
import com.fasterxml.jackson.databind.ObjectMapper;
19+
import tools.jackson.databind.ObjectMapper;
2020

2121
import org.springframework.cloud.function.json.JacksonMapper;
2222
import org.springframework.cloud.function.json.JsonMapper;

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323

2424
import com.amazonaws.services.lambda.runtime.Context;
2525
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
26-
import com.fasterxml.jackson.databind.MapperFeature;
2726
import org.apache.commons.logging.Log;
2827
import org.apache.commons.logging.LogFactory;
28+
import tools.jackson.databind.MapperFeature;
29+
import tools.jackson.databind.cfg.MapperBuilder;
2930

3031
import org.springframework.boot.builder.SpringApplicationBuilder;
3132
import org.springframework.cloud.function.context.FunctionCatalog;
@@ -114,7 +115,9 @@ private void start() {
114115
if (this.jsonMapper instanceof JacksonMapper) {
115116
((JacksonMapper) this.jsonMapper).configureObjectMapper(objectMapper -> {
116117
if (!objectMapper.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)) {
117-
objectMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
118+
MapperBuilder builder = objectMapper.rebuild();
119+
builder.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
120+
objectMapper = builder.build();
118121
}
119122
});
120123
}

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
import com.amazonaws.services.lambda.runtime.events.SNSEvent;
4747
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
4848
import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
49-
import com.fasterxml.jackson.databind.ObjectMapper;
5049
import org.assertj.core.api.Assertions;
5150
import org.junit.jupiter.api.BeforeEach;
5251
import org.junit.jupiter.api.Test;
5352
import org.mockito.Mockito;
5453
import reactor.core.publisher.Flux;
5554
import reactor.core.publisher.Mono;
55+
import tools.jackson.databind.ObjectMapper;
5656

5757
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
5858
import org.springframework.cloud.function.json.JacksonMapper;

spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@
5252
<artifactId>jakarta.servlet-api</artifactId>
5353
<scope>provided</scope>
5454
</dependency>
55-
5655
<dependency>
57-
<groupId>com.fasterxml.jackson.core</groupId>
56+
<groupId>tools.jackson.core</groupId>
5857
<artifactId>jackson-databind</artifactId>
5958
</dependency>
6059
<dependency>

spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureFunctionInstanceInjector.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.cloud.function.utils.FunctionClassUtils;
3030
import org.springframework.context.ConfigurableApplicationContext;
3131
import org.springframework.core.io.DefaultResourceLoader;
32-
import org.springframework.util.ClassUtils;
3332
import org.springframework.util.CollectionUtils;
3433

3534
/**
@@ -61,11 +60,6 @@ public class AzureFunctionInstanceInjector implements FunctionInstanceInjector {
6160
@Override
6261
public <T> T getInstance(Class<T> functionClass) throws Exception {
6362
try {
64-
// Backward compatibility workaround. If the function class is of type FunctionInvoker then create plain
65-
// Java instance and delegate to FunctionInvoker adaptor approach.
66-
if (ClassUtils.isAssignable(FunctionInvoker.class, functionClass)) {
67-
return functionClass.getDeclaredConstructor().newInstance();
68-
}
6963

7064
initialize();
7165

0 commit comments

Comments
 (0)