Skip to content

Commit 700284c

Browse files
committed
Remove version number from Jackson context serializer class name
Related to #4842
1 parent d4a7dfd commit 700284c

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
* @author Mahmoud Ben Hassine
3939
* @since 6.0.0
4040
*/
41-
public class Jackson3ExecutionContextStringSerializer implements ExecutionContextSerializer {
41+
public class JacksonExecutionContextStringSerializer implements ExecutionContextSerializer {
4242

4343
private final JsonMapper jsonMapper;
4444

4545
/**
46-
* Create a new {@link Jackson3ExecutionContextStringSerializer} with default
46+
* Create a new {@link JacksonExecutionContextStringSerializer} with default
4747
* configuration (only classes from certain packages will be allowed to be
4848
* deserialized).
4949
*/
50-
public Jackson3ExecutionContextStringSerializer() {
50+
public JacksonExecutionContextStringSerializer() {
5151
PolymorphicTypeValidator polymorphicTypeValidator = BasicPolymorphicTypeValidator.builder()
5252
.allowIfSubType("java.util.")
5353
.allowIfSubType("java.sql.")
@@ -62,11 +62,11 @@ public Jackson3ExecutionContextStringSerializer() {
6262
}
6363

6464
/**
65-
* Create a new {@link Jackson3ExecutionContextStringSerializer} with a custom
65+
* Create a new {@link JacksonExecutionContextStringSerializer} with a custom
6666
* {@link JsonMapper}.
6767
* @param jsonMapper the {@link JsonMapper} to use for serialization/deserialization
6868
*/
69-
public Jackson3ExecutionContextStringSerializer(JsonMapper jsonMapper) {
69+
public JacksonExecutionContextStringSerializer(JsonMapper jsonMapper) {
7070
this.jsonMapper = jsonMapper;
7171
}
7272

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.batch.core.job.builder.JobBuilder;
2828
import org.springframework.batch.core.job.parameters.JobParameters;
2929
import org.springframework.batch.core.launch.JobOperator;
30-
import org.springframework.batch.core.repository.dao.Jackson3ExecutionContextStringSerializer;
30+
import org.springframework.batch.core.repository.dao.JacksonExecutionContextStringSerializer;
3131
import org.springframework.batch.core.scope.context.ChunkContext;
3232
import org.springframework.batch.core.step.Step;
3333
import org.springframework.batch.core.step.StepContribution;
@@ -43,7 +43,7 @@
4343

4444
import static org.junit.jupiter.api.Assertions.assertEquals;
4545

46-
public class Jackson3ExecutionContextStringSerializerIntegrationTests {
46+
public class JacksonExecutionContextStringSerializerIntegrationTests {
4747

4848
@Test
4949
void testExecutionContextSerializationDeserializationRoundTrip() throws Exception {
@@ -101,8 +101,8 @@ public Job job(JobRepository jobRepository, Step step) {
101101
}
102102

103103
@Bean
104-
public Jackson3ExecutionContextStringSerializer serializer() {
105-
return new Jackson3ExecutionContextStringSerializer();
104+
public JacksonExecutionContextStringSerializer serializer() {
105+
return new JacksonExecutionContextStringSerializer();
106106
}
107107

108108
@Bean
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/**
3636
* @author Mahmoud Ben Hassine
3737
*/
38-
class Jackson3ExecutionContextStringSerializerTests {
38+
class JacksonExecutionContextStringSerializerTests {
3939

4040
record Person(int id, String name) implements Serializable {
4141
}
@@ -44,7 +44,7 @@ record Person(int id, String name) implements Serializable {
4444
void testSerializationDeserializationRoundTrip() throws IOException {
4545
// given
4646
JsonMapper jsonMapper = new JsonMapper();
47-
Jackson3ExecutionContextStringSerializer serializer = new Jackson3ExecutionContextStringSerializer(jsonMapper);
47+
JacksonExecutionContextStringSerializer serializer = new JacksonExecutionContextStringSerializer(jsonMapper);
4848
Person person = new Person(1, "John Doe");
4949
Map<String, Object> context = new HashMap<>();
5050
context.put("person", person);
@@ -61,7 +61,7 @@ void testSerializationDeserializationRoundTrip() throws IOException {
6161
@Test
6262
void testSqlTimestampSerialization() throws IOException {
6363
// given
64-
Jackson3ExecutionContextStringSerializer serializer = new Jackson3ExecutionContextStringSerializer();
64+
JacksonExecutionContextStringSerializer serializer = new JacksonExecutionContextStringSerializer();
6565
Map<String, Object> context = new HashMap<>(1);
6666
Timestamp timestamp = new Timestamp(Instant.now().toEpochMilli());
6767
context.put("timestamp", timestamp);
@@ -80,7 +80,7 @@ void testSqlTimestampSerialization() throws IOException {
8080
@Test
8181
void testJavaTimeLocalDateSerialization() throws IOException {
8282
// given
83-
Jackson3ExecutionContextStringSerializer serializer = new Jackson3ExecutionContextStringSerializer();
83+
JacksonExecutionContextStringSerializer serializer = new JacksonExecutionContextStringSerializer();
8484
Map<String, Object> map = new HashMap<>();
8585
LocalDate now = LocalDate.now();
8686
map.put("now", now);

spring-batch-samples/src/main/java/org/springframework/batch/samples/shutdown/JobConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.batch.core.job.builder.JobBuilder;
2727
import org.springframework.batch.core.repository.ExecutionContextSerializer;
2828
import org.springframework.batch.core.repository.JobRepository;
29-
import org.springframework.batch.core.repository.dao.Jackson3ExecutionContextStringSerializer;
29+
import org.springframework.batch.core.repository.dao.JacksonExecutionContextStringSerializer;
3030
import org.springframework.batch.core.step.Step;
3131
import org.springframework.batch.core.step.builder.StepBuilder;
3232
import org.springframework.batch.infrastructure.item.database.JdbcBatchItemWriter;
@@ -112,7 +112,7 @@ public JdbcTransactionManager transactionManager(DataSource dataSource) {
112112

113113
@Bean
114114
public ExecutionContextSerializer executionContextSerializer() {
115-
return new Jackson3ExecutionContextStringSerializer();
115+
return new JacksonExecutionContextStringSerializer();
116116
}
117117

118118
// run jobs in background threads to allow the main thread to continue

0 commit comments

Comments
 (0)