From eaba2ce4debf9473ee8db5cf9b48b30dd6f82c42 Mon Sep 17 00:00:00 2001 From: Radek Felcman Date: Tue, 28 Jan 2025 13:30:27 +0100 Subject: [PATCH 1/2] java.util.Date to java.time.LocalDate conversion fix Signed-off-by: Radek Felcman --- .../internal/helper/ConversionManager.java | 7 +++---- .../test/conversion/TestJavaTimeTypeConverter.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java index e73bb9c92a7..38bd5b3aa3d 100644 --- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java +++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2020 IBM Corporation and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -856,9 +856,8 @@ protected java.time.LocalDate convertObjectToLocalDate(Object sourceObject) thro } else if (sourceObject instanceof java.sql.Timestamp) { localDate = ((java.sql.Timestamp) sourceObject).toLocalDateTime().toLocalDate(); } else if (sourceObject instanceof java.util.Date) { - // handles sql.Time - java.util.Date date = (java.util.Date) sourceObject; - localDate = java.time.LocalDate.ofEpochDay(date.toInstant().getEpochSecond() / (60 * 60 * 24)); // Conv sec to day + // handles sql.Time too + localDate = ((java.util.Date) sourceObject).toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); } else if (sourceObject instanceof Calendar) { Calendar cal = (Calendar) sourceObject; localDate = java.time.LocalDate.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH)); diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java index cf85a13cee4..9a25c45e7e5 100644 --- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java +++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 IBM Corporation. All rights reserved. + * Copyright (c) 2020, 2025 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025 IBM Corporation. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -26,7 +26,10 @@ import java.time.Month; import java.time.OffsetDateTime; import java.time.OffsetTime; +import java.time.ZoneId; import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.temporal.TemporalField; import java.util.Calendar; import java.util.Date; @@ -74,8 +77,12 @@ public void timeConvertUtilDateToLocalDate() throws ParseException { Assert.assertEquals(2, date.getDate()); LocalDate ld = (LocalDate) cm.convertObject(date, ClassConstants.TIME_LDATE); + ZonedDateTime check = ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); Assert.assertNotNull(ld); + Assert.assertEquals(check.getYear(), ld.getYear()); + Assert.assertEquals(check.getMonth(), ld.getMonth()); + Assert.assertEquals(check.getDayOfMonth(), ld.getDayOfMonth()); Assert.assertEquals(2020, ld.getYear()); Assert.assertEquals(Month.JANUARY, ld.getMonth()); Assert.assertEquals(2, ld.getDayOfMonth()); From 75e8e5d7b54e528609e5218332b1c5cee4cf58a7 Mon Sep 17 00:00:00 2001 From: Onno Molenkamp Date: Tue, 25 Oct 2022 12:24:43 +0200 Subject: [PATCH 2/2] Correctly handle times after noon. Calendar.HOUR should only be used in conjunction with Calendar.AM_PM, in all other cases Calendar.HOUR_OF_DAY must be used. (cherry picked from commit 81e79a149af4016824a6c7006e93721166897864) Signed-off-by: Radek Felcman --- .../CacheInvalidationPolicyCloneTest.java | 2 +- .../performance/java/DatePrintingTest.java | 2 +- .../testing/tests/types/TimeDateTester.java | 2 +- .../internal/helper/ConversionManager.java | 16 ++-- .../internal/oxm/XMLConversionManager.java | 2 +- .../conversion/TestJavaTimeTypeConverter.java | 80 ++++++++++--------- .../TypedDirectMappingTestCases.java | 8 +- .../DateAndTimeTestCases.java | 28 +++---- .../persistence/sdo/helper/SDODataHelper.java | 6 +- .../datahelper/DataHelperToCalendarTest.java | 14 ++-- .../DataHelperToCalendarWithLocale.java | 14 ++-- .../datahelper/DataHelperToDateTest.java | 8 +- .../datahelper/DataHelperToDateTimeTest.java | 4 +- .../datahelper/DataHelperToDurationTest.java | 4 +- .../DataHelperToDurationWithCalnTest.java | 4 +- .../datahelper/DataHelperToTimeTest.java | 4 +- 16 files changed, 102 insertions(+), 96 deletions(-) diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/CacheInvalidationPolicyCloneTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/CacheInvalidationPolicyCloneTest.java index 555035f67b2..1bc028b4c1c 100644 --- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/CacheInvalidationPolicyCloneTest.java +++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/CacheInvalidationPolicyCloneTest.java @@ -54,7 +54,7 @@ public void test() { assertFalse("Clone should not be the same instance", policy == policyClone); assertEquals("Clone should be of the same type", policy.getClass(), policyClone.getClass()); assertEquals("Clone's expiry time should be the same", policy.getExpiryTime().getTimeInMillis(), policyClone.getExpiryTime().getTimeInMillis()); - assertEquals("Clone's expiry time should be 01:02:03.004 - hour", 1, policyClone.getExpiryTime().get(Calendar.HOUR)); + assertEquals("Clone's expiry time should be 01:02:03.004 - hour", 1, policyClone.getExpiryTime().get(Calendar.HOUR_OF_DAY)); assertEquals("Clone's expiry time should be 01:02:03.004 - minute", 2, policyClone.getExpiryTime().get(Calendar.MINUTE)); assertEquals("Clone's expiry time should be 01:02:03.004 - second", 3, policyClone.getExpiryTime().get(Calendar.SECOND)); assertEquals("Clone's expiry time should be 01:02:03.004 - millisecond", 4, policyClone.getExpiryTime().get(Calendar.MILLISECOND)); diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/DatePrintingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/DatePrintingTest.java index 18fa315a748..6dd20438361 100644 --- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/DatePrintingTest.java +++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/java/DatePrintingTest.java @@ -59,7 +59,7 @@ public void test() { writer.write(String.valueOf(calendar.get(Calendar.YEAR))); writer.write(String.valueOf(calendar.get(Calendar.DATE))); writer.write(String.valueOf(calendar.get(Calendar.MONTH))); - writer.write(String.valueOf(calendar.get(Calendar.HOUR))); + writer.write(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY))); writer.write(String.valueOf(calendar.get(Calendar.MINUTE))); writer.write(String.valueOf(calendar.get(Calendar.SECOND))); writer.toString(); diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/TimeDateTester.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/TimeDateTester.java index 9882e9f6cdc..b16bf35db0e 100644 --- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/TimeDateTester.java +++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/TimeDateTester.java @@ -50,7 +50,7 @@ public TimeDateTester(String nameOfTest, int year, int month, int date, int hrs, } public TimeDateTester(String nameOfTest, Calendar dateTime) { - this(nameOfTest, dateTime.get(Calendar.YEAR), dateTime.get(Calendar.MONTH), dateTime.get(Calendar.DATE), dateTime.get(Calendar.HOUR), dateTime.get(Calendar.MINUTE), dateTime.get(Calendar.SECOND), 0); + this(nameOfTest, dateTime.get(Calendar.YEAR), dateTime.get(Calendar.MONTH), dateTime.get(Calendar.DATE), dateTime.get(Calendar.HOUR_OF_DAY), dateTime.get(Calendar.MINUTE), dateTime.get(Calendar.SECOND), 0); } public static RelationalDescriptor descriptor() { diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java index 38bd5b3aa3d..cd7e3b41a72 100644 --- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java +++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java @@ -896,12 +896,12 @@ protected java.time.LocalTime convertObjectToLocalTime(Object sourceObject) thro Calendar cal = Helper.allocateCalendar(); cal.setTime((java.util.Date) sourceObject); localTime = java.time.LocalTime.of( - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); Helper.releaseCalendar(cal); } else if (sourceObject instanceof Calendar) { Calendar cal = (Calendar) sourceObject; localTime = java.time.LocalTime.of( - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); } else if (sourceObject instanceof Long) { localTime = java.time.LocalTime.ofSecondOfDay((Long) sourceObject); } else { @@ -936,13 +936,13 @@ protected java.time.LocalDateTime convertObjectToLocalDateTime(Object sourceObje cal.setTime((java.util.Date) sourceObject); localDateTime = java.time.LocalDateTime.of( cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH), - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); Helper.releaseCalendar(cal); } else if (sourceObject instanceof Calendar) { Calendar cal = (Calendar) sourceObject; localDateTime = java.time.LocalDateTime.of( cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH), - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); } else if (sourceObject instanceof Long) { localDateTime = java.time.LocalDateTime.ofInstant( java.time.Instant.ofEpochSecond((Long) sourceObject), getDefaultZoneOffset()); @@ -977,14 +977,14 @@ protected java.time.OffsetDateTime convertObjectToOffsetDateTime(Object sourceOb cal.setTime((java.util.Date) sourceObject); offsetDateTime = java.time.OffsetDateTime.of( cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH), - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND) * 1000000, + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND) * 1000000, java.time.ZoneOffset.ofTotalSeconds((cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / 1000)); Helper.releaseCalendar(cal); } else if (sourceObject instanceof Calendar) { Calendar cal = (Calendar) sourceObject; offsetDateTime = java.time.OffsetDateTime.of( cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH), - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND) * 1000000, + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND) * 1000000, java.time.ZoneOffset.ofTotalSeconds((cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / 1000)); } else if (sourceObject instanceof Long) { offsetDateTime = java.time.OffsetDateTime.ofInstant( @@ -1023,13 +1023,13 @@ protected java.time.OffsetTime convertObjectToOffsetTime(Object sourceObject) th Calendar cal = Helper.allocateCalendar(); cal.setTime((java.util.Date) sourceObject); offsetTime = java.time.OffsetTime.of( - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND), + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND), java.time.ZoneOffset.ofTotalSeconds((cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / 1000)); Helper.releaseCalendar(cal); } else if (sourceObject instanceof Calendar) { Calendar cal = (Calendar) sourceObject; offsetTime = java.time.OffsetTime.of( - cal.get(Calendar.HOUR), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND), + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND), java.time.ZoneOffset.ofTotalSeconds((cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / 1000)); } else if (sourceObject instanceof Long) { offsetTime = java.time.OffsetTime.ofInstant( diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java index 490e4052451..7194f648400 100644 --- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java +++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java @@ -1186,7 +1186,7 @@ private String truncateMillis(String xmlFormat) { } private String stringFromCalendar(Calendar sourceCalendar) { - if (!(sourceCalendar.isSet(Calendar.HOUR) || sourceCalendar.isSet(Calendar.MINUTE) || sourceCalendar.isSet(Calendar.SECOND) || sourceCalendar.isSet(Calendar.MILLISECOND))) { + if (!(sourceCalendar.isSet(Calendar.HOUR_OF_DAY) || sourceCalendar.isSet(Calendar.MINUTE) || sourceCalendar.isSet(Calendar.SECOND) || sourceCalendar.isSet(Calendar.MILLISECOND))) { return stringFromCalendar(sourceCalendar, Constants.DATE_QNAME); } else if (!(sourceCalendar.isSet(Calendar.YEAR) || sourceCalendar.isSet(Calendar.MONTH) || sourceCalendar.isSet(Calendar.DATE))) { return stringFromCalendar(sourceCalendar, Constants.TIME_QNAME); diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java index 9a25c45e7e5..a9c02534cbf 100644 --- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java +++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java @@ -150,29 +150,29 @@ public void timeConvertToLocalDateException() { // LocalDateTime @Test public void timeConvertLocalDateTimeToLocalDateTime() { - LocalDateTime src = LocalDateTime.of(2020, 1, 1, 1, 0, 0); + LocalDateTime src = LocalDateTime.of(2020, 1, 1, 16, 0, 0); LocalDateTime ld = (LocalDateTime) cm.convertObject(src, ClassConstants.TIME_LDATETIME); - + Assert.assertNotNull(ld); Assert.assertEquals(src, ld); Assert.assertEquals(Month.JANUARY, ld.getMonth()); Assert.assertEquals(1, ld.getDayOfMonth()); Assert.assertEquals(2020, ld.getYear()); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(0, ld.getMinute()); Assert.assertEquals(0, ld.getSecond()); } @Test public void timeConvertStringToLocalDateTime() { - String date = "2020-01-01T1:15:30"; + String date = "2020-01-01T16:15:30"; LocalDateTime ld = (LocalDateTime) cm.convertObject(date, ClassConstants.TIME_LDATETIME); Assert.assertNotNull(ld); Assert.assertEquals(Month.JANUARY, ld.getMonth()); Assert.assertEquals(1, ld.getDayOfMonth()); Assert.assertEquals(2020, ld.getYear()); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @@ -183,7 +183,7 @@ public void timeConvertUtilDateToLocalDateTime() { java.util.Date date = null; LocalDateTime ldt = null; - cal.set(2020, 0, 1, 2, 15, 30); + cal.set(2020, 0, 1, 16, 15, 30); date = cal.getTime(); ldt = (LocalDateTime) cm.convertObject(date, ClassConstants.TIME_LDATETIME); @@ -192,7 +192,7 @@ public void timeConvertUtilDateToLocalDateTime() { Assert.assertEquals(Month.JANUARY, ldt.getMonth()); Assert.assertEquals(1, ldt.getDayOfMonth()); Assert.assertEquals(2020, ldt.getYear()); - Assert.assertEquals(2, ldt.getHour()); + Assert.assertEquals(16, ldt.getHour()); Assert.assertEquals(15, ldt.getMinute()); Assert.assertEquals(30, ldt.getSecond()); } @@ -200,7 +200,7 @@ public void timeConvertUtilDateToLocalDateTime() { @Test public void timeConvertCalendarToLocalDateTime() { Calendar cal = Calendar.getInstance(); - cal.set(2020, 0, 1, 2, 15, 30); + cal.set(2020, 0, 1, 16, 15, 30); LocalDateTime ldt = (LocalDateTime) cm.convertObject(cal, ClassConstants.TIME_LDATETIME); @@ -208,7 +208,7 @@ public void timeConvertCalendarToLocalDateTime() { Assert.assertEquals(Month.JANUARY, ldt.getMonth()); Assert.assertEquals(1, ldt.getDayOfMonth()); Assert.assertEquals(2020, ldt.getYear()); - Assert.assertEquals(2, ldt.getHour()); + Assert.assertEquals(16, ldt.getHour()); Assert.assertEquals(15, ldt.getMinute()); Assert.assertEquals(30, ldt.getSecond()); } @@ -239,47 +239,47 @@ public void timeConvertToLocalDateTimeException() { // LocalTime @Test public void timeConvertLocalTimeToLocalTime() { - LocalTime src = LocalTime.of(1, 15, 30); + LocalTime src = LocalTime.of(16, 15, 30); LocalTime ld = (LocalTime) cm.convertObject(src, ClassConstants.TIME_LTIME); Assert.assertNotNull(ld); Assert.assertEquals(src, ld); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @Test public void timeConvertStringToLocalTime() { - String date = "T1:15:30"; + String date = "T16:15:30"; LocalTime ld = (LocalTime) cm.convertObject(date, ClassConstants.TIME_LTIME); Assert.assertNotNull(ld); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @Test public void timeConvertTimestampToLocalTime() { - java.sql.Timestamp ts = java.sql.Timestamp.valueOf("2020-01-01 01:15:30"); + java.sql.Timestamp ts = java.sql.Timestamp.valueOf("2020-01-01 16:15:30"); LocalTime ld = (LocalTime) cm.convertObject(ts, ClassConstants.TIME_LTIME); Assert.assertNotNull(ld); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @Test public void timeConvertTimeToLocalTime() { - java.sql.Time ts = java.sql.Time.valueOf("01:15:30"); + java.sql.Time ts = java.sql.Time.valueOf("16:15:30"); LocalTime ld = (LocalTime) cm.convertObject(ts, ClassConstants.TIME_LTIME); Assert.assertNotNull(ld); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @@ -290,24 +290,24 @@ public void timeConvertUtilDateToLocalTime() { java.util.Date date = null; LocalTime ld = null; - cal.set(2020, 0, 1, 2, 15, 30); + cal.set(2020, 0, 1, 16, 15, 30); date = cal.getTime(); ld = (LocalTime) cm.convertObject(date, ClassConstants.TIME_LTIME); Assert.assertNotNull(ld); - Assert.assertEquals(2, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @Test public void convertLongToLocalTime() { - long sod = 60*60 + 60*15 + 30; + long sod = 16*60*60 + 60*15 + 30; LocalTime ld = (LocalTime) cm.convertObject(sod, ClassConstants.TIME_LTIME); Assert.assertNotNull(ld); - Assert.assertEquals(1, ld.getHour()); + Assert.assertEquals(16, ld.getHour()); Assert.assertEquals(15, ld.getMinute()); Assert.assertEquals(30, ld.getSecond()); } @@ -329,7 +329,7 @@ public void timeConvertToLocalTimeException() { @Test public void timeConvertCalendarToOffsetDateTime() { Calendar cal = Calendar.getInstance(); - cal.set(2020, 0, 1, 0, 0, 0); + cal.set(2020, 0, 1, 16, 15, 30); OffsetDateTime odt = (OffsetDateTime) cm.convertObject(cal, ClassConstants.TIME_ODATETIME); @@ -337,6 +337,9 @@ public void timeConvertCalendarToOffsetDateTime() { Assert.assertEquals(Month.JANUARY, odt.getMonth()); Assert.assertEquals(1, odt.getDayOfMonth()); Assert.assertEquals(2020, odt.getYear()); + Assert.assertEquals(16, odt.getHour()); + Assert.assertEquals(15, odt.getMinute()); + Assert.assertEquals(30, odt.getSecond()); } @Test @@ -345,7 +348,7 @@ public void timeConvertUtilDateToOffsetDateTime() { java.util.Date date = null; OffsetDateTime odt = null; - cal.set(2020, 0, 1, 0, 0, 0); + cal.set(2020, 0, 1, 16, 15, 30); date = cal.getTime(); odt = (OffsetDateTime) cm.convertObject(date, ClassConstants.TIME_ODATETIME); @@ -354,11 +357,14 @@ public void timeConvertUtilDateToOffsetDateTime() { Assert.assertEquals(Month.JANUARY, odt.getMonth()); Assert.assertEquals(1, odt.getDayOfMonth()); Assert.assertEquals(2020, odt.getYear()); + Assert.assertEquals(16, odt.getHour()); + Assert.assertEquals(15, odt.getMinute()); + Assert.assertEquals(30, odt.getSecond()); } @Test public void timeConvertStringToOffsetDateTime() { - String date = "2020-01-01T1:15:30"; + String date = "2020-01-01T16:15:30"; OffsetDateTime odt = null; odt = (OffsetDateTime) cm.convertObject(date, ClassConstants.TIME_ODATETIME); @@ -367,14 +373,14 @@ public void timeConvertStringToOffsetDateTime() { Assert.assertEquals(Month.JANUARY, odt.getMonth()); Assert.assertEquals(1, odt.getDayOfMonth()); Assert.assertEquals(2020, odt.getYear()); - Assert.assertEquals(1, odt.getHour()); + Assert.assertEquals(16, odt.getHour()); Assert.assertEquals(15, odt.getMinute()); Assert.assertEquals(30, odt.getSecond()); } @Test public void timeConvertOffsetDateTimeToOffsetDateTime() { - OffsetDateTime original = OffsetDateTime.of(2020, 1, 1, 1, 15, 30, 0, ZoneOffset.UTC); + OffsetDateTime original = OffsetDateTime.of(2020, 1, 1, 16, 15, 30, 0, ZoneOffset.UTC); OffsetDateTime odt = null; odt = (OffsetDateTime) cm.convertObject(original, ClassConstants.TIME_ODATETIME); @@ -384,7 +390,7 @@ public void timeConvertOffsetDateTimeToOffsetDateTime() { Assert.assertEquals(Month.JANUARY, odt.getMonth()); Assert.assertEquals(1, odt.getDayOfMonth()); Assert.assertEquals(2020, odt.getYear()); - Assert.assertEquals(1, odt.getHour()); + Assert.assertEquals(16, odt.getHour()); Assert.assertEquals(15, odt.getMinute()); Assert.assertEquals(30, odt.getSecond()); } @@ -405,27 +411,27 @@ public void timeConvertToOffsetDateTimeException() { @Test public void timeConvertOffsetTimeToOffsetTime() { - OffsetTime original = OffsetTime.of(1, 15, 30, 0, ZoneOffset.UTC); + OffsetTime original = OffsetTime.of(16, 15, 30, 0, ZoneOffset.UTC); OffsetTime odt = null; odt = (OffsetTime) cm.convertObject(original, ClassConstants.TIME_OTIME); Assert.assertNotNull(odt); Assert.assertSame(original, odt); - Assert.assertEquals(1, odt.getHour()); + Assert.assertEquals(16, odt.getHour()); Assert.assertEquals(15, odt.getMinute()); Assert.assertEquals(30, odt.getSecond()); } @Test public void timeConvertStringToOffsetTime() { - String date = "T1:15:30"; + String date = "T16:15:30"; OffsetTime odt = null; odt = (OffsetTime) cm.convertObject(date, ClassConstants.TIME_OTIME); Assert.assertNotNull(odt); - Assert.assertEquals(1, odt.getHour()); + Assert.assertEquals(16, odt.getHour()); Assert.assertEquals(15, odt.getMinute()); Assert.assertEquals(30, odt.getSecond()); } @@ -436,13 +442,13 @@ public void timeConvertUtilDateToOffsetTime() { java.util.Date date = null; OffsetTime odt = null; - cal.set(2020, 0, 1, 1, 15, 30); + cal.set(2020, 0, 1, 16, 15, 30); date = cal.getTime(); odt = (OffsetTime) cm.convertObject(date, ClassConstants.TIME_OTIME); Assert.assertNotNull(odt); - Assert.assertEquals(1, odt.getHour()); + Assert.assertEquals(16, odt.getHour()); Assert.assertEquals(15, odt.getMinute()); Assert.assertEquals(30, odt.getSecond()); } @@ -450,23 +456,23 @@ public void timeConvertUtilDateToOffsetTime() { @Test public void timeConvertCalendarToOffsetTime() { Calendar cal = Calendar.getInstance(); - cal.set(2020, 0, 1, 1, 15, 30); + cal.set(2020, 0, 1, 16, 15, 30); OffsetTime odt = (OffsetTime) cm.convertObject(cal, ClassConstants.TIME_OTIME); Assert.assertNotNull(odt); - Assert.assertEquals(1, odt.getHour()); + Assert.assertEquals(16, odt.getHour()); Assert.assertEquals(15, odt.getMinute()); Assert.assertEquals(30, odt.getSecond()); } @Test public void testConvertLongToOffsetTime() { - long l = 18262 * (60 * 60 * 24) + (60*60 + 60*15 + 30); // 2020-01-01 T01:15:30 + long l = 18262 * (60 * 60 * 24) + (16*60*60 + 60*15 + 30); // 2020-01-01 T01:15:30 OffsetTime ldt = (OffsetTime) cm.convertObject(l, ClassConstants.TIME_OTIME); Assert.assertNotNull(ldt); - Assert.assertEquals(1, ldt.getHour()); + Assert.assertEquals(16, ldt.getHour()); Assert.assertEquals(15, ldt.getMinute()); Assert.assertEquals(30, ldt.getSecond()); } diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java index 35beca8f046..c1b980fd207 100644 --- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java +++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -115,13 +115,13 @@ public Object getControlObject() { parsedDate = new SimpleDateFormat(DATE_FORMAT).parse("2013-02-17"); date = Calendar.getInstance(); - date.setTime(parsedDate); date.clear(Calendar.HOUR); date.clear(Calendar.MINUTE); date.clear(Calendar.SECOND); date.clear(Calendar.MILLISECOND); date.clear(Calendar.ZONE_OFFSET); + date.setTime(parsedDate); date.clear(Calendar.HOUR_OF_DAY); date.clear(Calendar.MINUTE); date.clear(Calendar.SECOND); date.clear(Calendar.MILLISECOND); date.clear(Calendar.ZONE_OFFSET); parsedDate = new SimpleDateFormat(DATE_FORMAT).parse("2013-04-09"); date2 = Calendar.getInstance(); - date2.setTime(parsedDate); date2.clear(Calendar.HOUR); date2.clear(Calendar.MINUTE); date2.clear(Calendar.SECOND); date2.clear(Calendar.MILLISECOND); date2.clear(Calendar.ZONE_OFFSET); + date2.setTime(parsedDate); date2.clear(Calendar.HOUR_OF_DAY); date2.clear(Calendar.MINUTE); date2.clear(Calendar.SECOND); date2.clear(Calendar.MILLISECOND); date2.clear(Calendar.ZONE_OFFSET); parsedDate = new SimpleDateFormat(DATE_FORMAT).parse("2013-04-18"); date3 = Calendar.getInstance(); - date3.setTime(parsedDate); date3.clear(Calendar.HOUR); date3.clear(Calendar.MINUTE); date3.clear(Calendar.SECOND); date3.clear(Calendar.MILLISECOND); date3.clear(Calendar.ZONE_OFFSET); + date3.setTime(parsedDate); date3.clear(Calendar.HOUR_OF_DAY); date3.clear(Calendar.MINUTE); date3.clear(Calendar.SECOND); date3.clear(Calendar.MILLISECOND); date3.clear(Calendar.ZONE_OFFSET); parsedDate = new SimpleDateFormat(DATE_TIME_FORMAT).parse("2013-02-17T23:21:00"); dateTime = Calendar.getInstance(); dateTime.clear(); diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java index 0f95c3461e2..bc906ee91e3 100644 --- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java +++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -2867,7 +2867,7 @@ public void testCalendarToString_default_time_null() { public void testCalendarToString_default_time_0ms() { Calendar calendar = Calendar.getInstance(); calendar.clear(); - calendar.set(Calendar.HOUR, 7); + calendar.set(Calendar.HOUR_OF_DAY, 7); calendar.set(Calendar.MINUTE, 47); calendar.set(Calendar.SECOND, 15); calendar.set(Calendar.MILLISECOND, 0); @@ -2879,7 +2879,7 @@ public void testCalendarToString_default_time_0ms() { public void testCalendarToString_default_time_1ms() { Calendar calendar = Calendar.getInstance(); calendar.clear(); - calendar.set(Calendar.HOUR, 7); + calendar.set(Calendar.HOUR_OF_DAY, 7); calendar.set(Calendar.MINUTE, 47); calendar.set(Calendar.SECOND, 15); calendar.set(Calendar.MILLISECOND, 1); @@ -2891,7 +2891,7 @@ public void testCalendarToString_default_time_1ms() { public void testCalendarToString_default_time_10ms() { Calendar calendar = Calendar.getInstance(); calendar.clear(); - calendar.set(Calendar.HOUR, 7); + calendar.set(Calendar.HOUR_OF_DAY, 7); calendar.set(Calendar.MINUTE, 47); calendar.set(Calendar.SECOND, 15); calendar.set(Calendar.MILLISECOND, 10); @@ -2903,7 +2903,7 @@ public void testCalendarToString_default_time_10ms() { public void testCalendarToString_default_time_100ms() { Calendar calendar = Calendar.getInstance(); calendar.clear(); - calendar.set(Calendar.HOUR, 7); + calendar.set(Calendar.HOUR_OF_DAY, 7); calendar.set(Calendar.MINUTE, 47); calendar.set(Calendar.SECOND, 15); calendar.set(Calendar.MILLISECOND, 100); @@ -3786,7 +3786,7 @@ public void testPostADDateTimeToUtilDateWithHrMinSecMillis() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3818,7 +3818,7 @@ public void testPostADDateTimeToUtilDate_DateTime() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3857,7 +3857,7 @@ public void testPostADTimeToSQLTime_Date() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3876,7 +3876,7 @@ public void testPostADTimeToSQLTime_DateTime() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3912,7 +3912,7 @@ public void testPostADDateStringToUtilDate() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3944,7 +3944,7 @@ public void testPostADDateStringToUtilDate_DateTime() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3963,7 +3963,7 @@ public void testPostADDateStringToSqlTimestamp() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -3981,7 +3981,7 @@ public void testPostADDateStringToSqlTimestamp_DateTime() { cal.set(Calendar.YEAR, 0001); cal.set(Calendar.MONTH, Calendar.JANUARY); cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); @@ -4010,7 +4010,7 @@ public void testPostADDateStringToSqlTimestamp_Time() { Calendar cal = Calendar.getInstance(); cal.clear(); - cal.set(Calendar.HOUR, 1); + cal.set(Calendar.HOUR_OF_DAY, 1); cal.set(Calendar.MINUTE, 1); cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java index e62b35abdf8..a4f86084e79 100644 --- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java +++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -270,7 +270,7 @@ public String toDuration(Calendar calendar) { dur.append("M"); dur.append(calendar.get(Calendar.DATE)); dur.append("DT"); - dur.append(calendar.get(Calendar.HOUR)); + dur.append(calendar.get(Calendar.HOUR_OF_DAY)); dur.append("H"); dur.append(calendar.get(Calendar.MINUTE)); dur.append("M"); @@ -574,7 +574,7 @@ private void setCalendar(Calendar c, int i, int data) { c.set(Calendar.DATE, data); break; case 3: - c.set(Calendar.HOUR, data); + c.set(Calendar.HOUR_OF_DAY, data); break; case 4: c.set(Calendar.MINUTE, data); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java index 616e77545b9..8696835a3a5 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -86,13 +86,13 @@ public void testToCalendarWithGDay() { public void testToCalendarWithTime() { Calendar controlCalendar = Calendar.getInstance(); controlCalendar.clear(); - controlCalendar.set(Calendar.HOUR, 1); + controlCalendar.set(Calendar.HOUR_OF_DAY, 1); controlCalendar.set(Calendar.MINUTE, 21); controlCalendar.set(Calendar.SECOND, 12); controlCalendar.set(Calendar.MILLISECOND, 0); controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT")); Calendar aCalendar = dataHelper.toCalendar("01:21:12"); - assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR) + ", but was: " + aCalendar.get(Calendar.HOUR), controlCalendar.get(Calendar.HOUR) == aCalendar.get(Calendar.HOUR)); + assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR_OF_DAY) + ", but was: " + aCalendar.get(Calendar.HOUR_OF_DAY), controlCalendar.get(Calendar.HOUR_OF_DAY) == aCalendar.get(Calendar.HOUR_OF_DAY)); assertTrue("Expected MINUTE: " + controlCalendar.get(Calendar.MINUTE) + ", but was: " + aCalendar.get(Calendar.MINUTE), controlCalendar.get(Calendar.MINUTE) == aCalendar.get(Calendar.MINUTE)); assertTrue("Expected SECOND: " + controlCalendar.get(Calendar.SECOND) + ", but was: " + aCalendar.get(Calendar.SECOND), controlCalendar.get(Calendar.SECOND) == aCalendar.get(Calendar.SECOND)); assertTrue("Expected MILLISECOND: " + controlCalendar.get(Calendar.MILLISECOND) + ", but was: " + aCalendar.get(Calendar.MILLISECOND), controlCalendar.get(Calendar.MILLISECOND) == aCalendar.get(Calendar.MILLISECOND)); @@ -121,7 +121,7 @@ public void testToCalendarWithDateTime() { controlCalendar.set(Calendar.YEAR, 2001); controlCalendar.set(Calendar.MONTH, 0); controlCalendar.set(Calendar.DATE, 1); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 0); controlCalendar.set(Calendar.SECOND, 1); controlCalendar.set(Calendar.MILLISECOND, 0); @@ -130,7 +130,7 @@ public void testToCalendarWithDateTime() { assertTrue("Expected YEAR: " + controlCalendar.get(Calendar.YEAR) + ", but was: " + aCalendar.get(Calendar.YEAR), controlCalendar.get(Calendar.YEAR) == aCalendar.get(Calendar.YEAR)); assertTrue("Expected MONTH: " + controlCalendar.get(Calendar.MONTH) + ", but was: " + aCalendar.get(Calendar.MONTH), controlCalendar.get(Calendar.MONTH) == aCalendar.get(Calendar.MONTH)); assertTrue("Expected DATE: " + controlCalendar.get(Calendar.DATE) + ", but was: " + aCalendar.get(Calendar.DATE), controlCalendar.get(Calendar.DATE) == aCalendar.get(Calendar.DATE)); - assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR) + ", but was: " + aCalendar.get(Calendar.HOUR), controlCalendar.get(Calendar.HOUR) == aCalendar.get(Calendar.HOUR)); + assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR_OF_DAY) + ", but was: " + aCalendar.get(Calendar.HOUR_OF_DAY), controlCalendar.get(Calendar.HOUR_OF_DAY) == aCalendar.get(Calendar.HOUR_OF_DAY)); assertTrue("Expected MINUTE: " + controlCalendar.get(Calendar.MINUTE) + ", but was: " + aCalendar.get(Calendar.MINUTE), controlCalendar.get(Calendar.MINUTE) == aCalendar.get(Calendar.MINUTE)); assertTrue("Expected SECOND: " + controlCalendar.get(Calendar.SECOND) + ", but was: " + aCalendar.get(Calendar.SECOND), controlCalendar.get(Calendar.SECOND) == aCalendar.get(Calendar.SECOND)); assertTrue("Expected MILLISECOND: " + controlCalendar.get(Calendar.MILLISECOND) + ", but was: " + aCalendar.get(Calendar.MILLISECOND), controlCalendar.get(Calendar.MILLISECOND) == aCalendar.get(Calendar.MILLISECOND)); @@ -144,7 +144,7 @@ public void testToCalendarWithDuration() { controlCalendar.set(Calendar.YEAR, 12); controlCalendar.set(Calendar.MONTH, 9); controlCalendar.set(Calendar.DATE, 2); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 40); controlCalendar.set(Calendar.SECOND, 27); controlCalendar.set(Calendar.MILLISECOND, 870); @@ -155,7 +155,7 @@ public void testToCalendarWithDuration() { assertTrue("Expected YEAR: " + controlCalendar.get(Calendar.YEAR) + ", but was: " + aCalendar.get(Calendar.YEAR), controlCalendar.get(Calendar.YEAR) == aCalendar.get(Calendar.YEAR)); assertTrue("Expected MONTH: " + controlCalendar.get(Calendar.MONTH) + ", but was: " + aCalendar.get(Calendar.MONTH), controlCalendar.get(Calendar.MONTH) == aCalendar.get(Calendar.MONTH)); assertTrue("Expected DATE: " + controlCalendar.get(Calendar.DATE) + ", but was: " + aCalendar.get(Calendar.DATE), controlCalendar.get(Calendar.DATE) == aCalendar.get(Calendar.DATE)); - assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR) + ", but was: " + aCalendar.get(Calendar.HOUR), controlCalendar.get(Calendar.HOUR) == aCalendar.get(Calendar.HOUR)); + assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR_OF_DAY) + ", but was: " + aCalendar.get(Calendar.HOUR_OF_DAY), controlCalendar.get(Calendar.HOUR_OF_DAY) == aCalendar.get(Calendar.HOUR_OF_DAY)); assertTrue("Expected MINUTE: " + controlCalendar.get(Calendar.MINUTE) + ", but was: " + aCalendar.get(Calendar.MINUTE), controlCalendar.get(Calendar.MINUTE) == aCalendar.get(Calendar.MINUTE)); assertTrue("Expected SECOND: " + controlCalendar.get(Calendar.SECOND) + ", but was: " + aCalendar.get(Calendar.SECOND), controlCalendar.get(Calendar.SECOND) == aCalendar.get(Calendar.SECOND)); assertTrue("Expected MILLISECOND: " + controlCalendar.get(Calendar.MILLISECOND) + ", but was: " + aCalendar.get(Calendar.MILLISECOND), controlCalendar.get(Calendar.MILLISECOND) == aCalendar.get(Calendar.MILLISECOND)); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java index 38d0cc96d7f..87e002dde7d 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -93,13 +93,13 @@ public void testToCalendarWithTime() { Locale lc = Locale.US; Calendar controlCalendar = Calendar.getInstance(lc); controlCalendar.clear(); - controlCalendar.set(Calendar.HOUR, 1); + controlCalendar.set(Calendar.HOUR_OF_DAY, 1); controlCalendar.set(Calendar.MINUTE, 21); controlCalendar.set(Calendar.SECOND, 12); controlCalendar.set(Calendar.MILLISECOND, 0); controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT")); Calendar aCalendar = dataHelper.toCalendar("01:21:12", lc); - assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR) + ", but was: " + aCalendar.get(Calendar.HOUR), controlCalendar.get(Calendar.HOUR) == aCalendar.get(Calendar.HOUR)); + assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR_OF_DAY) + ", but was: " + aCalendar.get(Calendar.HOUR_OF_DAY), controlCalendar.get(Calendar.HOUR_OF_DAY) == aCalendar.get(Calendar.HOUR_OF_DAY)); assertTrue("Expected MINUTE: " + controlCalendar.get(Calendar.MINUTE) + ", but was: " + aCalendar.get(Calendar.MINUTE), controlCalendar.get(Calendar.MINUTE) == aCalendar.get(Calendar.MINUTE)); assertTrue("Expected SECOND: " + controlCalendar.get(Calendar.SECOND) + ", but was: " + aCalendar.get(Calendar.SECOND), controlCalendar.get(Calendar.SECOND) == aCalendar.get(Calendar.SECOND)); assertTrue("Expected MILLISECOND: " + controlCalendar.get(Calendar.MILLISECOND) + ", but was: " + aCalendar.get(Calendar.MILLISECOND), controlCalendar.get(Calendar.MILLISECOND) == aCalendar.get(Calendar.MILLISECOND)); @@ -130,7 +130,7 @@ public void testToCalendarWithDateTime() { controlCalendar.set(Calendar.YEAR, 2001); controlCalendar.set(Calendar.MONTH, 0); controlCalendar.set(Calendar.DATE, 1); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 0); controlCalendar.set(Calendar.SECOND, 1); controlCalendar.set(Calendar.MILLISECOND, 0); @@ -139,7 +139,7 @@ public void testToCalendarWithDateTime() { assertTrue("Expected YEAR: " + controlCalendar.get(Calendar.YEAR) + ", but was: " + aCalendar.get(Calendar.YEAR), controlCalendar.get(Calendar.YEAR) == aCalendar.get(Calendar.YEAR)); assertTrue("Expected MONTH: " + controlCalendar.get(Calendar.MONTH) + ", but was: " + aCalendar.get(Calendar.MONTH), controlCalendar.get(Calendar.MONTH) == aCalendar.get(Calendar.MONTH)); assertTrue("Expected DATE: " + controlCalendar.get(Calendar.DATE) + ", but was: " + aCalendar.get(Calendar.DATE), controlCalendar.get(Calendar.DATE) == aCalendar.get(Calendar.DATE)); - assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR) + ", but was: " + aCalendar.get(Calendar.HOUR), controlCalendar.get(Calendar.HOUR) == aCalendar.get(Calendar.HOUR)); + assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR_OF_DAY) + ", but was: " + aCalendar.get(Calendar.HOUR_OF_DAY), controlCalendar.get(Calendar.HOUR_OF_DAY) == aCalendar.get(Calendar.HOUR_OF_DAY)); assertTrue("Expected MINUTE: " + controlCalendar.get(Calendar.MINUTE) + ", but was: " + aCalendar.get(Calendar.MINUTE), controlCalendar.get(Calendar.MINUTE) == aCalendar.get(Calendar.MINUTE)); assertTrue("Expected SECOND: " + controlCalendar.get(Calendar.SECOND) + ", but was: " + aCalendar.get(Calendar.SECOND), controlCalendar.get(Calendar.SECOND) == aCalendar.get(Calendar.SECOND)); assertTrue("Expected MILLISECOND: " + controlCalendar.get(Calendar.MILLISECOND) + ", but was: " + aCalendar.get(Calendar.MILLISECOND), controlCalendar.get(Calendar.MILLISECOND) == aCalendar.get(Calendar.MILLISECOND)); @@ -154,7 +154,7 @@ public void testToCalendarWithDuration() { controlCalendar.set(Calendar.YEAR, 12); controlCalendar.set(Calendar.MONTH, Calendar.OCTOBER); controlCalendar.set(Calendar.DATE, 2); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 40); controlCalendar.set(Calendar.SECOND, 27); controlCalendar.set(Calendar.MILLISECOND, 870); @@ -163,7 +163,7 @@ public void testToCalendarWithDuration() { assertTrue("Expected YEAR: " + controlCalendar.get(Calendar.YEAR) + ", but was: " + aCalendar.get(Calendar.YEAR), controlCalendar.get(Calendar.YEAR) == aCalendar.get(Calendar.YEAR)); assertTrue("Expected MONTH: " + controlCalendar.get(Calendar.MONTH) + ", but was: " + aCalendar.get(Calendar.MONTH), controlCalendar.get(Calendar.MONTH) == aCalendar.get(Calendar.MONTH)); assertTrue("Expected DATE: " + controlCalendar.get(Calendar.DATE) + ", but was: " + aCalendar.get(Calendar.DATE), controlCalendar.get(Calendar.DATE) == aCalendar.get(Calendar.DATE)); - assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR) + ", but was: " + aCalendar.get(Calendar.HOUR), controlCalendar.get(Calendar.HOUR) == aCalendar.get(Calendar.HOUR)); + assertTrue("Expected HOUR: " + controlCalendar.get(Calendar.HOUR_OF_DAY) + ", but was: " + aCalendar.get(Calendar.HOUR_OF_DAY), controlCalendar.get(Calendar.HOUR_OF_DAY) == aCalendar.get(Calendar.HOUR_OF_DAY)); assertTrue("Expected MINUTE: " + controlCalendar.get(Calendar.MINUTE) + ", but was: " + aCalendar.get(Calendar.MINUTE), controlCalendar.get(Calendar.MINUTE) == aCalendar.get(Calendar.MINUTE)); assertTrue("Expected SECOND: " + controlCalendar.get(Calendar.SECOND) + ", but was: " + aCalendar.get(Calendar.SECOND), controlCalendar.get(Calendar.SECOND) == aCalendar.get(Calendar.SECOND)); assertTrue("Expected MILLISECOND: " + controlCalendar.get(Calendar.MILLISECOND) + ", but was: " + aCalendar.get(Calendar.MILLISECOND), controlCalendar.get(Calendar.MILLISECOND) == aCalendar.get(Calendar.MILLISECOND)); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java index 89a6e722e73..691a0221430 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -93,7 +93,7 @@ public void testToDateWithGDay() { public void testToDateWithTime() { Calendar controlCalendar = Calendar.getInstance(); controlCalendar.clear(); - controlCalendar.set(Calendar.HOUR, 1); + controlCalendar.set(Calendar.HOUR_OF_DAY, 1); controlCalendar.set(Calendar.MINUTE, 21); controlCalendar.set(Calendar.SECOND, 12); controlCalendar.set(Calendar.MILLISECOND, 37); @@ -121,7 +121,7 @@ public void testToDateWithDateTime() { controlCalendar.set(Calendar.YEAR, 2001); controlCalendar.set(Calendar.MONTH, 9); controlCalendar.set(Calendar.DATE, 1); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 0); controlCalendar.set(Calendar.SECOND, 1); controlCalendar.set(Calendar.MILLISECOND, 1); @@ -137,7 +137,7 @@ public void testToDateWithDuration() { controlCalendar.set(Calendar.YEAR, 12); controlCalendar.set(Calendar.MONTH, 9); controlCalendar.set(Calendar.DATE, 2); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 40); controlCalendar.set(Calendar.SECOND, 27); controlCalendar.set(Calendar.MILLISECOND, 87); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java index 5bfe856f76a..6e84669b89a 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -31,7 +31,7 @@ public void testToDateTimeWithFullSetting() { controlCalendar.set(Calendar.YEAR, 2001); controlCalendar.set(Calendar.MONTH, 4); controlCalendar.set(Calendar.DATE, 1); - controlCalendar.set(Calendar.HOUR, 12); + controlCalendar.set(Calendar.HOUR_OF_DAY, 12); controlCalendar.set(Calendar.MINUTE, 23); controlCalendar.set(Calendar.SECOND, 11); controlCalendar.set(Calendar.MILLISECOND, 1); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java index 7236a86ac07..34043ea5960 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -31,7 +31,7 @@ public void testToDurationWithFullSetting() { controlCalendar.set(Calendar.YEAR, 12); controlCalendar.set(Calendar.MONTH, 8); controlCalendar.set(Calendar.DATE, 2); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 40); controlCalendar.set(Calendar.SECOND, 27); controlCalendar.set(Calendar.MILLISECOND, 870); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java index a3e53d92b4f..52e2bdcf6dc 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -30,7 +30,7 @@ public void testToDateTimeWithFullSetting() { controlCalendar.set(Calendar.YEAR, 12); controlCalendar.set(Calendar.MONTH, 10); controlCalendar.set(Calendar.DATE, 2); - controlCalendar.set(Calendar.HOUR, 0); + controlCalendar.set(Calendar.HOUR_OF_DAY, 0); controlCalendar.set(Calendar.MINUTE, 40); controlCalendar.set(Calendar.SECOND, 27); controlCalendar.set(Calendar.MILLISECOND, 870); diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java index 328e2a210fa..e9b6f003ba1 100644 --- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java +++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -28,7 +28,7 @@ public DataHelperToTimeTest(String name) { public void testToTimeWithFullSetting() { Calendar controlCalendar = Calendar.getInstance(); controlCalendar.clear(); - controlCalendar.set(Calendar.HOUR, 12); + controlCalendar.set(Calendar.HOUR_OF_DAY, 12); controlCalendar.set(Calendar.MINUTE, 23); controlCalendar.set(Calendar.SECOND, 11); controlCalendar.set(Calendar.MILLISECOND, 1);