From 9c354919e5c64e1787b6f335601aafcde059570f Mon Sep 17 00:00:00 2001 From: Noemi Praml Date: Wed, 25 May 2022 10:36:52 +0200 Subject: [PATCH] refactoring (cherry picked from commit 43e28c4f5c747cdda2e3547a8db593eab490ceec) --- .../ebeaninternal/server/core/timezone/DataTimeZone.java | 7 +++---- .../server/core/timezone/MySqlDataTimeZone.java | 2 +- .../main/java/io/ebeaninternal/server/type/DataBind.java | 4 ++-- .../java/io/ebeaninternal/server/type/RsetDataReader.java | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java index 775e826d1..ff9366802 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java @@ -13,11 +13,10 @@ public interface DataTimeZone { Calendar getTimeZone(); /** - * Return the Calendar to use for Timezone information when reading/writing date. - * A 'date' only value has normally no timezone information, but some platforms (like MySQL) - * reqire this. + * Return the Calendar to use for Timezone information when reading/writing a time component (date only/time only). + * A time component has normally no timezone information, but some platforms (like MySQL) reqire this. */ - default Calendar getDateTimeZone() { + default Calendar getTimeComponentTimeZone() { return null; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java index 85ceab500..102fcd88f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java @@ -19,7 +19,7 @@ public class MySqlDataTimeZone implements DataTimeZone { } @Override - public Calendar getDateTimeZone() { + public Calendar getTimeComponentTimeZone() { return zone; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java index 2ef0c6db3..ab17244e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java @@ -158,7 +158,7 @@ public class DataBind implements DataBinder { @Override public final void setDate(java.sql.Date v) throws SQLException { - Calendar timeZone = dataTimeZone.getDateTimeZone(); + Calendar timeZone = dataTimeZone.getTimeComponentTimeZone(); if (timeZone != null) { pstmt.setDate(++pos, v, timeZone); } else { @@ -178,7 +178,7 @@ public class DataBind implements DataBinder { @Override public final void setTime(Time v) throws SQLException { - Calendar timeZone = dataTimeZone.getDateTimeZone(); + Calendar timeZone = dataTimeZone.getTimeComponentTimeZone(); if (timeZone != null) { pstmt.setTime(++pos, v, timeZone); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java index 4bb1be3ae..5bf529d77 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java @@ -107,7 +107,7 @@ public class RsetDataReader implements DataReader { @Override public final Date getDate() throws SQLException { - Calendar cal = dataTimeZone.getDateTimeZone(); + Calendar cal = dataTimeZone.getTimeComponentTimeZone(); if (cal != null) { return rset.getDate(pos(), cal); } else { @@ -156,7 +156,7 @@ public class RsetDataReader implements DataReader { @Override public final Time getTime() throws SQLException { - Calendar cal = dataTimeZone.getDateTimeZone(); + Calendar cal = dataTimeZone.getTimeComponentTimeZone(); if (cal != null) { return rset.getTime(pos(), cal); } else {