Migrate java type descriptor tests and fix JdbcTimestampTypeDescriptor

hibernate-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.time.ZoneId;
-import java.text.SimpleDateFormat;
+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;
+	public static final DateTimeFormatter LITERAL_FORMATTER = DateTimeFormatter.ofPattern( TIMESTAMP_FORMAT )
-
+			.withZone( ZoneId.from( ZoneOffset.UTC ) );
-	/**
-	 * 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 class TimestampMutabilityPlan extends MutableMutabilityPlan<Date> {
 		public static final TimestampMutabilityPlan INSTANCE = new TimestampMutabilityPlan();
@@ -92,15 +86,19 @@ public class JdbcTimestampTypeDescriptor extends AbstractTemporalTypeDescriptor<
 
 	@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 );
 		}
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;
 

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;
 

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;
 

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/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;
 

hibernate-core/src/test/java/org/hibernate/orm/test/type/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;

hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/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;