From 716ddc43a896e3369399fcc6b4ac12ebdde1587f Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 16 May 2022 13:59:27 +0200 Subject: [PATCH] Deprecate classes supporting H2 1.x. Support for the 1.x branch of H2 will be dropped with the next major release. See #1243 --- .../H2TimestampWithTimeZoneToOffsetDateTimeConverter.java | 8 +++++--- .../data/jdbc/core/dialect/JdbcH2Dialect.java | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/H2TimestampWithTimeZoneToOffsetDateTimeConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/H2TimestampWithTimeZoneToOffsetDateTimeConverter.java index 76876764..28ac727a 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/H2TimestampWithTimeZoneToOffsetDateTimeConverter.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/H2TimestampWithTimeZoneToOffsetDateTimeConverter.java @@ -23,13 +23,15 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.ReadingConverter; /** - * Converter converting from an H2 internal representation of a timestamp with time zone to an OffsetDateTime. - * - * Only required for H2 versions < 2.0 + * Converter converting from an H2 internal representation of a timestamp with time zone to an OffsetDateTime. Only + * required for H2 versions < 2.0 * * @author Jens Schauder * @since 2.7 + * @deprecated This is only used for H2 1.x support which will be dropped with the next major release. Use H2Dialect + * instead. */ +@Deprecated @ReadingConverter public enum H2TimestampWithTimeZoneToOffsetDateTimeConverter implements Converter { diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcH2Dialect.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcH2Dialect.java index 15807ff4..d93291ad 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcH2Dialect.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcH2Dialect.java @@ -28,7 +28,10 @@ import org.springframework.data.relational.core.dialect.H2Dialect; * @author Jens Schauder * @author Christoph Strobl * @since 2.3 + * @deprecated This is only used for H2 1.x support which will be dropped with the next major release. Use H2Dialect + * instead. */ +@Deprecated public class JdbcH2Dialect extends H2Dialect { public static JdbcH2Dialect INSTANCE = new JdbcH2Dialect(); @@ -56,7 +59,7 @@ public class JdbcH2Dialect extends H2Dialect { JdbcH2Dialect.class.getClassLoader().loadClass("org.h2.api.TimestampWithTimeZone"); return true; - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException e) { return false; } }