From f00cde15e1768931a241b6b8c86fc4ce50c122c6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 12 Feb 2020 10:48:57 +0100 Subject: [PATCH] DATACASS-728 - Deprecate Joda-Time and ThreeTenBackport support. Joda-Time and ThreeTenBackport converters are now deprecated in favor of JSR-310 (java.time) support. These converters are now in maintenance mode without receiving future enhancements. --- .../core/convert/CassandraJodaTimeConverters.java | 13 ++++++++++++- .../CassandraThreeTenBackPortConverters.java | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java index 62242fde1..fb0715c40 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java @@ -37,8 +37,9 @@ import org.springframework.util.ClassUtils; * * @author Mark Paluch * @since 1.5 + * @deprecated since 3.0, use JSR-310 types as replacement for Joda-Time. */ -@SuppressWarnings("deprecation") +@Deprecated public abstract class CassandraJodaTimeConverters { private static final boolean JODA_TIME_IS_PRESENT = ClassUtils.isPresent("org.joda.time.LocalDate", null); @@ -83,6 +84,7 @@ public abstract class CassandraJodaTimeConverters { * * @author Mark Paluch */ + @Deprecated public enum MillisOfDayToLocalTimeConverter implements Converter { INSTANCE; @@ -98,6 +100,7 @@ public abstract class CassandraJodaTimeConverters { * * @author Mark Paluch */ + @Deprecated public enum LocalTimeToMillisOfDayConverter implements Converter { INSTANCE; @@ -114,6 +117,7 @@ public abstract class CassandraJodaTimeConverters { * @author Mark Paluch */ @WritingConverter + @Deprecated public enum FromJodaLocalTimeConverter implements Converter { INSTANCE; @@ -129,6 +133,7 @@ public abstract class CassandraJodaTimeConverters { * * @author Mark Paluch */ + @Deprecated public enum ToJodaLocalTimeConverter implements Converter { INSTANCE; @@ -145,6 +150,7 @@ public abstract class CassandraJodaTimeConverters { * @author Mark Paluch */ @WritingConverter + @Deprecated public enum FromJodaLocalDateConverter implements Converter { INSTANCE; @@ -160,6 +166,7 @@ public abstract class CassandraJodaTimeConverters { * * @author Mark Paluch */ + @Deprecated public enum ToJodaLocalDateConverter implements Converter { INSTANCE; @@ -175,6 +182,7 @@ public abstract class CassandraJodaTimeConverters { * * @since 3.0 */ + @Deprecated public enum LocalDateTimeToInstantConverter implements Converter { INSTANCE; @@ -190,6 +198,7 @@ public abstract class CassandraJodaTimeConverters { * * @since 3.0 */ + @Deprecated public enum InstantToLocalDateTimeConverter implements Converter { INSTANCE; @@ -205,6 +214,7 @@ public abstract class CassandraJodaTimeConverters { * * @since 3.0 */ + @Deprecated public enum DateTimeToInstantConverter implements Converter { INSTANCE; @@ -220,6 +230,7 @@ public abstract class CassandraJodaTimeConverters { * * @since 3.0 */ + @Deprecated public enum InstantToDateTimeConverter implements Converter { INSTANCE; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java index c2ae3cad3..7987ba10b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java @@ -41,7 +41,9 @@ import org.threeten.bp.temporal.ChronoField; * @author Mark Paluch * @see Threeten Backport * @since 1.5 + * @deprecated since 3.0, use JSR-310 types as replacement for ThreeTen Backport. */ +@Deprecated public abstract class CassandraThreeTenBackPortConverters { private static final boolean THREE_TEN_BACK_PORT_IS_PRESENT = ClassUtils.isPresent("org.threeten.bp.LocalDateTime", @@ -94,6 +96,7 @@ public abstract class CassandraThreeTenBackPortConverters { * @author Mark Paluch * @since 2.1 */ + @Deprecated public enum MillisOfDayToLocalTimeConverter implements Converter { INSTANCE; @@ -111,6 +114,7 @@ public abstract class CassandraThreeTenBackPortConverters { * @since 2.1 */ @ReadingConverter + @Deprecated public enum LocalTimeToMillisOfDayConverter implements Converter { INSTANCE; @@ -127,6 +131,7 @@ public abstract class CassandraThreeTenBackPortConverters { * @since 3.0 */ @WritingConverter + @Deprecated public enum FromBpLocalTimeConverter implements Converter { INSTANCE; @@ -142,6 +147,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated public enum ToBpLocalTimeConverter implements Converter { INSTANCE; @@ -158,6 +164,7 @@ public abstract class CassandraThreeTenBackPortConverters { * @since 3.0 */ @WritingConverter + @Deprecated public enum FromBpLocalDateConverter implements Converter { INSTANCE; @@ -173,6 +180,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated public enum ToBpLocalDateConverter implements Converter { INSTANCE; @@ -189,6 +197,7 @@ public abstract class CassandraThreeTenBackPortConverters { * @since 3.0 */ @ReadingConverter + @Deprecated public enum FromBpLocalDateTimeConverter implements Converter { INSTANCE; @@ -205,6 +214,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated public enum ToBpLocalDateTimeConverter implements Converter { INSTANCE; @@ -221,6 +231,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated enum LocalDateTimeToInstantConverter implements Converter { INSTANCE; @@ -236,6 +247,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated enum BpInstantToInstantConverter implements Converter { INSTANCE; @@ -251,6 +263,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated enum InstantToBpInstantConverter implements Converter { INSTANCE; @@ -266,6 +279,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated enum ZoneIdToStringConverter implements Converter { INSTANCE; @@ -281,6 +295,7 @@ public abstract class CassandraThreeTenBackPortConverters { * * @since 3.0 */ + @Deprecated enum StringToZoneIdConverter implements Converter { INSTANCE;