Skip to content

Commit f390890

Browse files
NetyyyyNetyyyy
committed
replace with jackson2
1 parent 77268f0 commit f390890

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

‎eng/versioning/external_dependencies.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ springboot4_org.springframework.boot:spring-boot-data-redis;4.0.0
352352
springboot4_org.springframework.boot:spring-boot-docker-compose;4.0.0
353353
springboot4_org.springframework.boot:spring-boot-health;4.0.0
354354
springboot4_org.springframework.boot:spring-boot-http-converter;4.0.0
355-
springboot4_org.springframework.boot:spring-boot-jackson;4.0.0
355+
springboot4_org.springframework.boot:spring-boot-jackson2;4.0.0
356356
springboot4_org.springframework.boot:spring-boot-jdbc;4.0.0
357357
springboot4_org.springframework.boot:spring-boot-jms;4.0.0
358358
springboot4_org.springframework.boot:spring-boot-kafka;4.0.0

‎sdk/spring/spring-cloud-azure-autoconfigure/pom.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,8 @@
181181
<!--Jackson-->
182182
<dependency>
183183
<groupId>org.springframework.boot</groupId>
184-
<artifactId>spring-boot-jackson</artifactId>
185-
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-jackson;external_dependency} -->
186-
<optional>true</optional>
187-
</dependency>
188-
<dependency>
189-
<groupId>com.fasterxml.jackson.datatype</groupId>
190-
<artifactId>jackson-datatype-jsr310</artifactId>
191-
<version>2.20.1</version> <!-- {x-version-update;springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
192-
<optional>true</optional>
184+
<artifactId>spring-boot-jackson2</artifactId>
185+
<version>4.0.0</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-jackson2;external_dependency} -->
193186
</dependency>
194187

195188
<!-- Azure SDKs-->
@@ -549,7 +542,6 @@
549542
<includes>
550543
<include>com.azure:azure-servicebus-jms:[2.1.0]</include> <!-- {x-include-update;com.azure:azure-servicebus-jms;external_dependency} -->
551544
<include>com.mysql:mysql-connector-j:[9.5.0]</include> <!-- {x-include-update;springboot4_com.mysql:mysql-connector-j;external_dependency} -->
552-
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1]</include> <!-- {x-include-update;springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
553545
<include>io.lettuce:lettuce-core:[6.8.1.RELEASE]</include> <!-- {x-include-update;springboot4_io.lettuce:lettuce-core;external_dependency} -->
554546
<include>jakarta.servlet:jakarta.servlet-api:[6.1.0]</include> <!-- {x-include-update;springboot4_jakarta.servlet:jakarta.servlet-api;external_dependency} -->
555547
<include>jakarta.validation:jakarta.validation-api:[3.1.1]</include> <!-- {x-include-update;springboot4_jakarta.validation:jakarta.validation-api;external_dependency} -->
@@ -562,7 +554,7 @@
562554
<include>org.springframework.boot:spring-boot-data-redis:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-data-redis;external_dependency} -->
563555
<include>org.springframework.boot:spring-boot-http-converter:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-http-converter;external_dependency} -->
564556
<include>org.springframework.boot:spring-boot-kafka:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-kafka;external_dependency} -->
565-
<include>org.springframework.boot:spring-boot-jackson:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-jackson;external_dependency} -->
557+
<include>org.springframework.boot:spring-boot-jackson2:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-jackson2;external_dependency} -->
566558
<include>org.springframework.boot:spring-boot-jdbc:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-jdbc;external_dependency} -->
567559
<include>org.springframework.boot:spring-boot-jms:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-jms;external_dependency} -->
568560
<include>org.springframework.boot:spring-boot-restclient:[4.0.0]</include> <!-- {x-include-update;springboot4_org.springframework.boot:spring-boot-restclient;external_dependency} -->

‎sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.fasterxml.jackson.databind.ObjectMapper;
1212
import org.junit.jupiter.api.Test;
1313
import org.springframework.boot.autoconfigure.AutoConfigurations;
14-
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
14+
import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration;
1515
import org.springframework.boot.test.context.FilteredClassLoader;
1616
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
1717

@@ -77,10 +77,11 @@ void connectionInfoAndCheckpointStoreProvidedShouldConfigure() {
7777
}
7878

7979
@Test
80+
@SuppressWarnings("removal")
8081
void withoutObjectMapperShouldNotConfigure() {
8182
this.contextRunner
8283
.withClassLoader(new FilteredClassLoader(ObjectMapper.class))
83-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
84+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
8485
.withPropertyValues(
8586
"spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace")
8687
)
@@ -89,11 +90,12 @@ void withoutObjectMapperShouldNotConfigure() {
8990
}
9091

9192
@Test
93+
@SuppressWarnings("removal")
9294
void withIsolatedObjectMapper() {
9395
this.contextRunner
9496
.withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"))
9597
.withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class)
96-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
98+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
9799
.run(context -> {
98100
assertThat(context).hasBean("defaultEventHubsMessageConverter");
99101
assertThat(context).hasSingleBean(EventHubsMessageConverter.class);
@@ -102,12 +104,13 @@ void withIsolatedObjectMapper() {
102104
}
103105

104106
@Test
107+
@SuppressWarnings("removal")
105108
void withNonIsolatedObjectMapper() {
106109
this.contextRunner
107110
.withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"),
108111
"spring.cloud.azure.message-converter.isolated-object-mapper=false")
109112
.withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class)
110-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
113+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
111114
.run(context -> {
112115
assertThat(context).hasBean("eventHubsMessageConverter");
113116
assertThat(context).hasSingleBean(EventHubsMessageConverter.class);
@@ -116,13 +119,14 @@ void withNonIsolatedObjectMapper() {
116119
}
117120

118121
@Test
122+
@SuppressWarnings("removal")
119123
void withUserProvidedObjectMapper() {
120124
this.contextRunner
121125
.withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"),
122126
"spring.cloud.azure.message-converter.isolated-object-mapper=false")
123127
.withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class)
124128
.withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper())
125-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
129+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
126130
.run(context -> {
127131
assertThat(context).hasBean("userObjectMapper");
128132
assertThat(context).hasSingleBean(ObjectMapper.class);

‎sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.fasterxml.jackson.databind.ObjectMapper;
1010
import org.junit.jupiter.api.Test;
1111
import org.springframework.boot.autoconfigure.AutoConfigurations;
12-
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
12+
import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration;
1313
import org.springframework.boot.test.context.FilteredClassLoader;
1414
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
1515

@@ -73,23 +73,25 @@ void connectionInfoProvidedShouldConfigure() {
7373
}
7474

7575
@Test
76+
@SuppressWarnings("removal")
7677
void withoutObjectMapperShouldNotConfigure() {
7778
this.contextRunner
7879
.withClassLoader(new FilteredClassLoader(ObjectMapper.class))
7980
.withPropertyValues(
8081
"spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace")
8182
)
82-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
83+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
8384
.withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class)
8485
.run(context -> assertThatIllegalStateException());
8586
}
8687

8788
@Test
89+
@SuppressWarnings("removal")
8890
void withIsolatedObjectMapper() {
8991
this.contextRunner
9092
.withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"))
9193
.withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class)
92-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
94+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
9395
.run(context -> {
9496
assertThat(context).hasBean("defaultServiceBusMessageConverter");
9597
assertThat(context).hasSingleBean(ServiceBusMessageConverter.class);
@@ -98,12 +100,13 @@ void withIsolatedObjectMapper() {
98100
}
99101

100102
@Test
103+
@SuppressWarnings("removal")
101104
void withNonIsolatedObjectMapper() {
102105
this.contextRunner
103106
.withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"),
104107
"spring.cloud.azure.message-converter.isolated-object-mapper=false")
105108
.withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class)
106-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
109+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
107110
.run(context -> {
108111
assertThat(context).hasBean("serviceBusMessageConverter");
109112
assertThat(context).hasSingleBean(ServiceBusMessageConverter.class);
@@ -112,13 +115,14 @@ void withNonIsolatedObjectMapper() {
112115
}
113116

114117
@Test
118+
@SuppressWarnings("removal")
115119
void withUserProvidedObjectMapper() {
116120
this.contextRunner
117121
.withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"),
118122
"spring.cloud.azure.message-converter.isolated-object-mapper=false")
119123
.withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class)
120124
.withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper())
121-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
125+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
122126
.run(context -> {
123127
assertThat(context).hasBean("userObjectMapper");
124128
assertThat(context).hasSingleBean(ObjectMapper.class);

‎sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.fasterxml.jackson.databind.ObjectMapper;
1010
import org.junit.jupiter.api.Test;
1111
import org.springframework.boot.autoconfigure.AutoConfigurations;
12-
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
12+
import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration;
1313
import org.springframework.boot.context.properties.ConfigurationProperties;
1414
import org.springframework.boot.test.context.FilteredClassLoader;
1515
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -25,20 +25,22 @@ public class AzureStorageQueueMessagingAutoConfigurationTests {
2525
.withConfiguration(AutoConfigurations.of(AzureStorageQueueMessagingAutoConfiguration.class));
2626

2727
@Test
28+
@SuppressWarnings("removal")
2829
void withoutObjectMapperShouldNotConfigure() {
2930
this.contextRunner
3031
.withClassLoader(new FilteredClassLoader(ObjectMapper.class))
31-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
32+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
3233
.withPropertyValues("spring.cloud.azure.storage.queue.enabled=true")
3334
.withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class)
3435
.run(context -> assertThatIllegalStateException());
3536
}
3637

3738
@Test
39+
@SuppressWarnings("removal")
3840
void withIsolatedObjectMapper() {
3941
this.contextRunner
4042
.withPropertyValues("spring.cloud.azure.storage.queue.enabled=true")
41-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
43+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
4244
.withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class)
4345
.run(context -> {
4446
assertThat(context).hasBean("defaultStorageQueueMessageConverter");
@@ -48,11 +50,12 @@ void withIsolatedObjectMapper() {
4850
}
4951

5052
@Test
53+
@SuppressWarnings("removal")
5154
void withNonIsolatedObjectMapper() {
5255
this.contextRunner
5356
.withPropertyValues("spring.cloud.azure.storage.queue.enabled=true",
5457
"spring.cloud.azure.message-converter.isolated-object-mapper=false")
55-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
58+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
5659
.withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class)
5760
.run(context -> {
5861
assertThat(context).hasBean("storageQueueMessageConverter");
@@ -62,11 +65,12 @@ void withNonIsolatedObjectMapper() {
6265
}
6366

6467
@Test
68+
@SuppressWarnings("removal")
6569
void withUserProvidedObjectMapper() {
6670
this.contextRunner
6771
.withPropertyValues("spring.cloud.azure.storage.queue.enabled=true",
6872
"spring.cloud.azure.message-converter.isolated-object-mapper=false")
69-
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
73+
.withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class))
7074
.withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class)
7175
.withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper())
7276
.run(context -> {

0 commit comments

Comments
 (0)