HHH-18532 Fixed two things:

          - reordered matching in unwrap methods to push java.util.Date after java.sql.{Date,Time,Timestamp}
          - use new java.sql.{Date,Time}(instant.toEpochMilli()) instead of java.sql.{Date,Time}.from(instant);
            later method is not subclasses so it is always returning instance of java.util.Date

Author: cigaly

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java

@@ -123,6 +123,14 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 			return unwrapSqlDate( value );
 		}
 
+		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
+			return new java.sql.Timestamp( unwrapDateEpoch( value ) );
+		}
+
+		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
+			throw new IllegalArgumentException( "Illegal attempt to treat `java.sql.Date` as `java.sql.Time`" );
+		}
+
 		if ( java.util.Date.class.isAssignableFrom( type ) ) {
 			return value;
 		}
@@ -141,14 +149,6 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 			return cal;
 		}
 
-		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return new java.sql.Timestamp( unwrapDateEpoch( value ) );
-		}
-
-		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			throw new IllegalArgumentException( "Illegal attempt to treat `java.sql.Date` as `java.sql.Time`" );
-		}
-
 		throw unknownUnwrap( type );
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java

@@ -140,6 +140,14 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 					: new Time( value.getTime() % 86_400_000 );
 		}
 
+		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
+			return new java.sql.Timestamp( value.getTime() );
+		}
+
+		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
+			throw new IllegalArgumentException( "Illegal attempt to treat `java.sql.Time` as `java.sql.Date`" );
+		}
+
 		if ( Date.class.isAssignableFrom( type ) ) {
 			return value;
 		}
@@ -158,14 +166,6 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 			return cal;
 		}
 
-		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return new java.sql.Timestamp( value.getTime() );
-		}
-
-		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			throw new IllegalArgumentException( "Illegal attempt to treat `java.sql.Time` as `java.sql.Date`" );
-		}
-
 		throw unknownUnwrap( type );
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java

@@ -127,6 +127,18 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 					: new Timestamp( value.getTime() );
 		}
 
+		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
+			return value instanceof java.sql.Date
+					? ( java.sql.Date ) value
+					: new java.sql.Date( value.getTime() );
+		}
+
+		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
+			return value instanceof java.sql.Time
+					? ( java.sql.Time ) value
+					: new java.sql.Time( value.getTime() );
+		}
+
 		if ( Date.class.isAssignableFrom( type ) ) {
 			return value;
 		}
@@ -146,18 +158,6 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 			return value.getTime();
 		}
 
-		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return value instanceof java.sql.Date
-					? ( java.sql.Date ) value
-					: new java.sql.Date( value.getTime() );
-		}
-
-		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return value instanceof java.sql.Time
-					? ( java.sql.Time ) value
-					: new java.sql.Time( value.getTime() % 86_400_000 );
-		}
-
 		throw unknownUnwrap( type );
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java

@@ -97,12 +97,12 @@ public <X> X unwrap(LocalDateTime value, Class<X> type, WrapperOptions options)
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
 			Instant instant = value.atZone( ZoneId.systemDefault() ).toInstant();
-			return (X) java.sql.Date.from( instant );
+			return (X) new java.sql.Date( instant.toEpochMilli() );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
 			Instant instant = value.atZone( ZoneId.systemDefault() ).toInstant();
-			return (X) java.sql.Time.from( instant );
+			return (X) new java.sql.Time( instant.toEpochMilli() );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java

@@ -158,11 +158,11 @@ public <X> X unwrap(OffsetDateTime offsetDateTime, Class<X> type, WrapperOptions
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Date.from( offsetDateTime.toInstant() );
+			return (X) new java.sql.Date( offsetDateTime.toInstant().toEpochMilli() );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Time.from( offsetDateTime.toInstant() );
+			return (X) new java.sql.Time( offsetDateTime.toInstant().toEpochMilli() );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java

@@ -138,6 +138,10 @@ public <X> X unwrap(OffsetTime offsetTime, Class<X> type, WrapperOptions options
 			return (X) Long.valueOf( instant.toEpochMilli() );
 		}
 
+		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
+			throw new IllegalArgumentException( "Illegal attempt to treat `java.time.OffsetTime` as `java.sql.Date`" );
+		}
+
 		if ( Date.class.isAssignableFrom( type ) ) {
 			return (X) Date.from( instant );
 		}

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java

@@ -120,11 +120,11 @@ public <X> X unwrap(ZonedDateTime zonedDateTime, Class<X> type, WrapperOptions o
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Date.from( zonedDateTime.toInstant() );
+			return (X) new java.sql.Date( zonedDateTime.toInstant().toEpochMilli() );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Time.from( zonedDateTime.toInstant() );
+			return (X) new java.sql.Time( zonedDateTime.toInstant().toEpochMilli() );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {