Skip to content

Commit f1b3bc4

Browse files
committed
Fix for the latest dependency changes
* Upgrade to the latest Jackson version * Use Jackson 3 API in the `testcontainers-rabbitmq` since this is now a default in Spring Boot * Fix `web-sockets` to implement `getComponentType()` on the custom `AbstractPayloadTransformer` since that is a requirement now in Spring Integration
1 parent 60f1500 commit f1b3bc4

File tree

3 files changed

+15
-10
lines changed
  • basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server
  • intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq

3 files changed

+15
-10
lines changed

basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -108,7 +108,12 @@ public HeaderEnricher headerEnricher() {
108108
@Bean
109109
@Transformer(inputChannel = "transformChannel", outputChannel = "sendTimeChannel")
110110
public AbstractPayloadTransformer<?, ?> transformer() {
111-
return new AbstractPayloadTransformer<Object, Object>() {
111+
return new AbstractPayloadTransformer<>() {
112+
113+
@Override
114+
public String getComponentType() {
115+
return "user-transformer";
116+
}
112117

113118
@Override
114119
protected Object transformPayload(Object payload) {

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ subprojects { subproject ->
230230
groovyVersion = '4.0.27'
231231
hsqldbVersion = '2.7.4'
232232
h2Version = '2.3.232'
233-
jacksonVersion = '2.19.1'
234-
jackson3Version = '3.0.0-rc5'
233+
jacksonVersion = '2.20.0'
234+
jackson3Version = '3.0.0-rc9'
235235
jaxbVersion = '4.0.5'
236236
jodaTimeVersion = '2.14.0'
237237
jtaVersion = '2.0.1'

intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,16 +16,16 @@
1616

1717
package org.springframework.integration.samples.testcontainersrabbitmq;
1818

19+
import tools.jackson.databind.json.JsonMapper;
20+
1921
import org.springframework.amqp.rabbit.core.RabbitTemplate;
20-
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
22+
import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
2123
import org.springframework.amqp.support.converter.MessageConverter;
2224
import org.springframework.context.annotation.Bean;
2325
import org.springframework.context.annotation.Configuration;
2426
import org.springframework.integration.amqp.dsl.Amqp;
2527
import org.springframework.integration.dsl.IntegrationFlow;
2628

27-
import com.fasterxml.jackson.databind.ObjectMapper;
28-
2929
@Configuration
3030
public class IntegrationConfig {
3131

@@ -39,8 +39,8 @@ public IntegrationFlow request(RabbitTemplate amqpTemplate) {
3939
}
4040

4141
@Bean
42-
public MessageConverter jsonMessageConverter(ObjectMapper objectMapper) {
43-
return new Jackson2JsonMessageConverter(objectMapper);
42+
public MessageConverter jsonMessageConverter(JsonMapper jsonMapper) {
43+
return new JacksonJsonMessageConverter(jsonMapper);
4444
}
4545

4646
}

0 commit comments

Comments
 (0)