Migrate java type descriptor tests and fix JdbcTimestampTypeDescriptor

hibernate · Mar 9, 2021 · ce41447 · ce41447
1 parent a3d2f19
commit ce41447
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 34 deletions.
diff --git a/...te-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java b/...te-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java
@@ -7,9 +7,12 @@
 package org.hibernate.type.descriptor.java;
 
 import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -41,17 +44,8 @@ public class JdbcTimestampTypeDescriptor extends AbstractTemporalTypeDescriptor<
 	 * @see #TIMESTAMP_FORMAT
 	 */
 	@SuppressWarnings("unused")
-	public static final DateTimeFormatter LITERAL_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-
-	/**
-	 * Alias for {@link java.time.format.DateTimeFormatter#ISO_LOCAL_DATE_TIME}.
-	 *
-	 * Intended for use with logging
-	 *
-	 * @see #LITERAL_FORMATTER
-	 */
-	@SuppressWarnings({"unused", "WeakerAccess"})
-	public static final DateTimeFormatter LOGGABLE_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+	public static final DateTimeFormatter LITERAL_FORMATTER = DateTimeFormatter.ofPattern( TIMESTAMP_FORMAT )
+			.withZone( ZoneId.from( ZoneOffset.UTC ) );
 
 	public static class TimestampMutabilityPlan extends MutableMutabilityPlan<Date> {
 		public static final TimestampMutabilityPlan INSTANCE = new TimestampMutabilityPlan();
@@ -92,15 +86,19 @@ protected <X> TemporalJavaTypeDescriptor<X> forTimestampPrecision(TypeConfigurat
 
 	@Override
 	public String toString(Date value) {
-		return LOGGABLE_FORMATTER.format( value.toInstant() );
+		return LITERAL_FORMATTER.format( value.toInstant() );
 	}
 
 	@Override
 	public Date fromString(String string) {
 		try {
-			return new Timestamp( new SimpleDateFormat( TIMESTAMP_FORMAT ).parse( string ).getTime() );
+			final TemporalAccessor accessor = LITERAL_FORMATTER.parse( string );
+			return new Timestamp(
+					accessor.getLong( ChronoField.INSTANT_SECONDS ) * 1000L
+							+ accessor.get( ChronoField.NANO_OF_SECOND ) / 1_000_000
+			);
 		}
-		catch ( ParseException pe) {
+		catch ( DateTimeParseException pe) {
 			throw new HibernateException( "could not parse timestamp string" + string, pe );
 		}
 	}

diff --git a/...scriptor/java/AbstractDescriptorTest.java → ...scriptor/java/AbstractDescriptorTest.java b/...scriptor/java/AbstractDescriptorTest.java → ...scriptor/java/AbstractDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 import java.io.Serializable;
 import java.sql.Blob;
 import java.sql.Clob;

diff --git a/...riptor/java/BigDecimalDescriptorTest.java → ...riptor/java/BigDecimalDescriptorTest.java b/...riptor/java/BigDecimalDescriptorTest.java → ...riptor/java/BigDecimalDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 import java.math.BigDecimal;
 
 import org.hibernate.type.descriptor.java.BigDecimalTypeDescriptor;

diff --git a/...riptor/java/BigIntegerDescriptorTest.java → ...riptor/java/BigIntegerDescriptorTest.java b/...riptor/java/BigIntegerDescriptorTest.java → ...riptor/java/BigIntegerDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 import java.math.BigInteger;
 
 import org.hibernate.type.descriptor.java.BigIntegerTypeDescriptor;

diff --git a/...e/descriptor/java/BlobDescriptorTest.java → ...e/descriptor/java/BlobDescriptorTest.java b/...e/descriptor/java/BlobDescriptorTest.java → ...e/descriptor/java/BlobDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

diff --git a/...escriptor/java/BooleanDescriptorTest.java → ...escriptor/java/BooleanDescriptorTest.java b/...escriptor/java/BooleanDescriptorTest.java → ...escriptor/java/BooleanDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 
 import org.hibernate.type.descriptor.java.BooleanTypeDescriptor;

diff --git a/...scriptor/java/DurationDescriptorTest.java → ...scriptor/java/DurationDescriptorTest.java b/...scriptor/java/DurationDescriptorTest.java → ...scriptor/java/DurationDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.Duration;
 import org.hibernate.type.descriptor.java.DurationJavaDescriptor;

diff --git a/...escriptor/java/InstantDescriptorTest.java → ...escriptor/java/InstantDescriptorTest.java b/...escriptor/java/InstantDescriptorTest.java → ...escriptor/java/InstantDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.Instant;
 import org.hibernate.type.descriptor.java.InstantJavaDescriptor;

diff --git a/...ptor/java/JdbcTimeTypeDescriptorTest.java → ...ptor/java/JdbcTimeTypeDescriptorTest.java b/...ptor/java/JdbcTimeTypeDescriptorTest.java → ...ptor/java/JdbcTimeTypeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.util.Date;
 

diff --git a/...java/JdbcTimestampTypeDescriptorTest.java → ...java/JdbcTimestampTypeDescriptorTest.java b/...java/JdbcTimestampTypeDescriptorTest.java → ...java/JdbcTimestampTypeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.util.Date;
 

diff --git a/...criptor/java/LocalDateDescriptorTest.java → ...criptor/java/LocalDateDescriptorTest.java b/...criptor/java/LocalDateDescriptorTest.java → ...criptor/java/LocalDateDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.LocalDate;
 import org.hibernate.type.descriptor.java.LocalDateJavaDescriptor;

diff --git a/...tor/java/LocalDateTimeDescriptorTest.java → ...tor/java/LocalDateTimeDescriptorTest.java b/...tor/java/LocalDateTimeDescriptorTest.java → ...tor/java/LocalDateTimeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.LocalDateTime;
 import org.hibernate.type.descriptor.java.LocalDateTimeJavaDescriptor;

diff --git a/...criptor/java/LocalTimeDescriptorTest.java → ...criptor/java/LocalTimeDescriptorTest.java b/...criptor/java/LocalTimeDescriptorTest.java → ...criptor/java/LocalTimeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.LocalDate;
 import org.hibernate.type.descriptor.java.LocalDateJavaDescriptor;

diff --git a/...riptor/java/LocaleTypeDescriptorTest.java → ...riptor/java/LocaleTypeDescriptorTest.java b/...riptor/java/LocaleTypeDescriptorTest.java → ...riptor/java/LocaleTypeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/...or/java/OffsetDateTimeDescriptorTest.java → ...or/java/OffsetDateTimeDescriptorTest.java b/...or/java/OffsetDateTimeDescriptorTest.java → ...or/java/OffsetDateTimeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;

diff --git a/...riptor/java/OffsetTimeDescriptorTest.java → ...riptor/java/OffsetTimeDescriptorTest.java b/...riptor/java/OffsetTimeDescriptorTest.java → ...riptor/java/OffsetTimeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.LocalTime;
 import java.time.OffsetTime;

diff --git a/...ava/PrimitiveByteArrayDescriptorTest.java → ...ava/PrimitiveByteArrayDescriptorTest.java b/...ava/PrimitiveByteArrayDescriptorTest.java → ...ava/PrimitiveByteArrayDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayTypeDescriptor;
 

diff --git a/...descriptor/java/StringDescriptorTest.java → ...descriptor/java/StringDescriptorTest.java b/...descriptor/java/StringDescriptorTest.java → ...descriptor/java/StringDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 
 import org.hibernate.type.descriptor.java.StringTypeDescriptor;

diff --git a/...tor/java/ZonedDateTimeDescriptorTest.java → ...tor/java/ZonedDateTimeDescriptorTest.java b/...tor/java/ZonedDateTimeDescriptorTest.java → ...tor/java/ZonedDateTimeDescriptorTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.type.descriptor.java;
+package org.hibernate.orm.test.type.descriptor.java;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;