Revert "Deprecate JobParametersConverter"

fmbenhassine · fmbenhassine · commit 88d76d871a9e · 2025-07-04T16:24:03.000+02:00
This reverts commit 2d22aa4.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/AbstractDateTimeConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/AbstractDateTimeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 class AbstractDateTimeConverter {
 
 	protected DateTimeFormatter instantFormatter = DateTimeFormatter.ISO_INSTANT;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DateToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DateToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class DateToStringConverter extends AbstractDateTimeConverter implements Converter<Date, String> {
 
 	@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2025 the original author or authors.
+ * Copyright 2006-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,9 +70,8 @@
  * @author Dave Syer
  * @author Michael Minella
  * @author Mahmoud Ben Hassine
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
+ *
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class DefaultJobParametersConverter implements JobParametersConverter {
 
 	protected ConfigurableConversionService conversionService;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConversionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class JobParametersConversionException extends RuntimeException {
 
 	/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2025 the original author or authors.
+ * Copyright 2006-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,8 @@
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
  * @see JobParametersBuilder
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
+ *
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public interface JobParametersConverter {
 
 	/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,9 +63,8 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
+ *
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class JsonJobParametersConverter extends DefaultJobParametersConverter {
 
 	private final ObjectMapper objectMapper;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateTimeToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateTimeToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class LocalDateTimeToStringConverter extends AbstractDateTimeConverter
 		implements Converter<LocalDateTime, String> {
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class LocalDateToStringConverter extends AbstractDateTimeConverter implements Converter<LocalDate, String> {
 
 	@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalTimeToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalTimeToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class LocalTimeToStringConverter extends AbstractDateTimeConverter implements Converter<LocalTime, String> {
 
 	@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class StringToDateConverter extends AbstractDateTimeConverter implements Converter<String, Date> {
 
 	@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class StringToLocalDateConverter extends AbstractDateTimeConverter implements Converter<String, LocalDate> {
 
 	@Override
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateTimeConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateTimeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class StringToLocalDateTimeConverter extends AbstractDateTimeConverter
 		implements Converter<String, LocalDateTime> {
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalTimeConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalTimeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,7 @@
  *
  * @author Mahmoud Ben Hassine
  * @since 5.0.1
- * @deprecated since 6.0 with no replacement, scheduled for removal in 6.2 or later.
  */
-@Deprecated(since = "6.0", forRemoval = true)
 public class StringToLocalTimeConverter extends AbstractDateTimeConverter implements Converter<String, LocalTime> {
 
 	@Override
