Skip to content

move incubating enum TimeZoneStorageStrategy to org.hibernate.type #10026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2025
Merged

move incubating enum TimeZoneStorageStrategy to org.hibernate.type #10026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aea98eb
move incubating enum TimeZoneStorageStrategy to org.hibernate.type
gavinking Apr 15, 2025
c065b01
use && in TimeZoneStorageHelper for readability
gavinking Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/TimeZoneStorageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import org.hibernate.Incubating;
import org.hibernate.dialect.Dialect;
import org.hibernate.type.TimeZoneStorageStrategy;

/**
* Describes the storage of timezone information for zoned datetime types,
Expand Down Expand Up @@ -61,7 +62,7 @@
* @since 6.0
*
* @see TimeZoneStorage
* @see org.hibernate.TimeZoneStorageStrategy
* @see TimeZoneStorageStrategy
*/
@Incubating
public enum TimeZoneStorageType {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import org.hibernate.AnnotationException;
import org.hibernate.HibernateException;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.TimeZoneStorageType;
import org.hibernate.boot.CacheRegionDefinition;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.hibernate.LockOptions;
import org.hibernate.SessionEventListener;
import org.hibernate.SessionFactoryObserver;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.CacheLayout;
import org.hibernate.boot.SchemaAutoTooling;
import org.hibernate.boot.TempTableDdlTransactionHandling;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.hibernate.AnnotationException;
import org.hibernate.AssertionFailure;
import org.hibernate.MappingException;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.*;
import org.hibernate.boot.internal.AnyKeyType;
import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
Expand Down
32 changes: 12 additions & 20 deletions hibernate-core/src/main/java/org/hibernate/boot/model/internal/TimeZoneStorageHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.hibernate.usertype.internal.OffsetTimeCompositeUserType;
import org.hibernate.usertype.internal.ZonedDateTimeCompositeUserType;

import static org.hibernate.TimeZoneStorageStrategy.COLUMN;
import static org.hibernate.type.TimeZoneStorageStrategy.COLUMN;
import static org.hibernate.dialect.TimeZoneSupport.NATIVE;

public class TimeZoneStorageHelper {
Expand All @@ -33,7 +33,7 @@ static Class<? extends CompositeUserType<?>> resolveTimeZoneStorageCompositeUser
ClassDetails returnedClass,
MetadataBuildingContext context) {
if ( useColumnForTimeZoneStorage( attributeMember, context ) ) {
String returnedClassName = returnedClass.getName();
final String returnedClassName = returnedClass.getName();
if ( OFFSET_DATETIME_CLASS.equals( returnedClassName ) ) {
return OffsetDateTimeCompositeUserType.class;
}
Expand All @@ -49,24 +49,20 @@ else if ( OFFSET_TIME_CLASS.equals( returnedClassName ) ) {

private static boolean isTemporalWithTimeZoneClass(String returnedClassName) {
return OFFSET_DATETIME_CLASS.equals( returnedClassName )
|| ZONED_DATETIME_CLASS.equals( returnedClassName )
|| isOffsetTimeClass( returnedClassName );
|| ZONED_DATETIME_CLASS.equals( returnedClassName )
|| isOffsetTimeClass( returnedClassName );
}

public static boolean isOffsetTimeClass(AnnotationTarget element) {
if ( element instanceof MemberDetails memberDetails ) {
return isOffsetTimeClass( memberDetails );
}
return false;
return element instanceof MemberDetails memberDetails
&& isOffsetTimeClass( memberDetails );
}

public static boolean isOffsetTimeClass(MemberDetails element) {
final TypeDetails type = element.getType();
if ( type == null ) {
return false;
}
return type != null
&& isOffsetTimeClass( type.determineRawClass().getClassName() );

return isOffsetTimeClass( type.determineRawClass().getClassName() );
}

private static boolean isOffsetTimeClass(String returnedClassName) {
Expand All @@ -76,14 +72,10 @@ private static boolean isOffsetTimeClass(String returnedClassName) {
static boolean useColumnForTimeZoneStorage(AnnotationTarget element, MetadataBuildingContext context) {
final TimeZoneStorage timeZoneStorage = element.getDirectAnnotationUsage( TimeZoneStorage.class );
if ( timeZoneStorage == null ) {
if ( element instanceof MemberDetails attributeMember ) {
return isTemporalWithTimeZoneClass( attributeMember.getType().getName() )
//no @TimeZoneStorage annotation, so we need to use the default storage strategy
&& context.getBuildingOptions().getDefaultTimeZoneStorage() == COLUMN;
}
else {
return false;
}
return element instanceof MemberDetails attributeMember
&& isTemporalWithTimeZoneClass( attributeMember.getType().getName() )
//no @TimeZoneStorage annotation, so we need to use the default storage strategy
&& context.getBuildingOptions().getDefaultTimeZoneStorage() == COLUMN;
}
else {
return switch ( timeZoneStorage.value() ) {
Expand Down
2 changes: 1 addition & 1 deletion ...rnate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.function.Function;
import jakarta.persistence.TemporalType;

import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.TimeZoneStorageType;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.dialect.Dialect;
Expand Down
2 changes: 1 addition & 1 deletion ...-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.List;

import org.hibernate.HibernateException;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.boot.model.relational.ColumnOrderingStrategy;
Expand Down
2 changes: 1 addition & 1 deletion ...te-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.hibernate.Interceptor;
import org.hibernate.LockOptions;
import org.hibernate.SessionFactoryObserver;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.CacheLayout;
import org.hibernate.boot.SchemaAutoTooling;
import org.hibernate.boot.TempTableDdlTransactionHandling;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.List;

import org.hibernate.Incubating;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.boot.model.relational.ColumnOrderingStrategy;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.hibernate.LockOptions;
import org.hibernate.SessionEventListener;
import org.hibernate.SessionFactoryObserver;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.CacheLayout;
import org.hibernate.boot.SchemaAutoTooling;
import org.hibernate.boot.TempTableDdlTransactionHandling;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.hibernate.Incubating;
import org.hibernate.Internal;
import org.hibernate.MappingException;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.SoftDelete;
import org.hibernate.annotations.SoftDeleteType;
import org.hibernate.annotations.TimeZoneStorageType;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.hibernate.FetchMode;
import org.hibernate.Internal;
import org.hibernate.MappingException;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.OnDeleteAction;
import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
Expand Down
12 changes: 6 additions & 6 deletions hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ private StandardBasicTypes() {

/**
* The standard Hibernate type for mapping {@link OffsetDateTime} to JDBC {@link org.hibernate.type.SqlTypes#TIMESTAMP_WITH_TIMEZONE TIMESTAMP_WITH_TIMEZONE}.
* This maps to {@link org.hibernate.TimeZoneStorageStrategy#NATIVE}.
* This maps to {@link TimeZoneStorageStrategy#NATIVE}.
*/
public static final BasicTypeReference<OffsetDateTime> OFFSET_DATE_TIME_WITH_TIMEZONE = new BasicTypeReference<>(
"OffsetDateTimeWithTimezone",
Expand All @@ -402,7 +402,7 @@ private StandardBasicTypes() {
);
/**
* The standard Hibernate type for mapping {@link OffsetDateTime} to JDBC {@link org.hibernate.type.SqlTypes#TIMESTAMP TIMESTAMP}.
* This maps to {@link org.hibernate.TimeZoneStorageStrategy#NORMALIZE}.
* This maps to {@link TimeZoneStorageStrategy#NORMALIZE}.
*/
public static final BasicTypeReference<OffsetDateTime> OFFSET_DATE_TIME_WITHOUT_TIMEZONE = new BasicTypeReference<>(
"OffsetDateTimeWithoutTimezone",
Expand All @@ -421,7 +421,7 @@ private StandardBasicTypes() {

/**
* The standard Hibernate type for mapping {@link OffsetTime} to JDBC {@link org.hibernate.type.SqlTypes#TIME_UTC TIME_UTC}.
* This maps to {@link org.hibernate.TimeZoneStorageStrategy#NORMALIZE_UTC}.
* This maps to {@link TimeZoneStorageStrategy#NORMALIZE_UTC}.
*/
public static final BasicTypeReference<OffsetTime> OFFSET_TIME_UTC = new BasicTypeReference<>(
"OffsetTimeUtc",
Expand All @@ -431,7 +431,7 @@ private StandardBasicTypes() {

/**
* The standard Hibernate type for mapping {@link OffsetTime} to JDBC {@link org.hibernate.type.SqlTypes#TIME_WITH_TIMEZONE TIME_WITH_TIMEZONE}.
* This maps to {@link org.hibernate.TimeZoneStorageStrategy#NATIVE}.
* This maps to {@link TimeZoneStorageStrategy#NATIVE}.
*/
public static final BasicTypeReference<OffsetTime> OFFSET_TIME_WITH_TIMEZONE = new BasicTypeReference<>(
"OffsetTimeWithTimezone",
Expand Down Expand Up @@ -460,7 +460,7 @@ private StandardBasicTypes() {

/**
* The standard Hibernate type for mapping {@link ZonedDateTime} to JDBC {@link org.hibernate.type.SqlTypes#TIMESTAMP_WITH_TIMEZONE TIMESTAMP_WITH_TIMEZONE}.
* This maps to {@link org.hibernate.TimeZoneStorageStrategy#NATIVE}.
* This maps to {@link TimeZoneStorageStrategy#NATIVE}.
*/
public static final BasicTypeReference<ZonedDateTime> ZONED_DATE_TIME_WITH_TIMEZONE = new BasicTypeReference<>(
"ZonedDateTimeWithTimezone",
Expand All @@ -470,7 +470,7 @@ private StandardBasicTypes() {

/**
* The standard Hibernate type for mapping {@link ZonedDateTime} to JDBC {@link org.hibernate.type.SqlTypes#TIMESTAMP TIMESTAMP}.
* This maps to {@link org.hibernate.TimeZoneStorageStrategy#NORMALIZE}.
* This maps to {@link TimeZoneStorageStrategy#NORMALIZE}.
*/
public static final BasicTypeReference<ZonedDateTime> ZONED_DATE_TIME_WITHOUT_TIMEZONE = new BasicTypeReference<>(
"ZonedDateTimeWithoutTimezone",
Expand Down
4 changes: 3 additions & 1 deletion ...rg/hibernate/TimeZoneStorageStrategy.java → ...bernate/type/TimeZoneStorageStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
* SPDX-License-Identifier: Apache-2.0
* Copyright Red Hat Inc. and Hibernate Authors
*/
package org.hibernate;
package org.hibernate.type;

import org.hibernate.Incubating;

/**
* Enumerates the possible storage strategies for offset or zoned datetimes.
Expand Down
2 changes: 1 addition & 1 deletion ...e-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package org.hibernate.type.descriptor.jdbc;

import org.hibernate.Incubating;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.dialect.Dialect;
import org.hibernate.type.spi.TypeConfiguration;

Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import jakarta.persistence.TemporalType;

import org.hibernate.Incubating;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.dialect.Dialect;
import org.hibernate.type.SqlTypes;
import org.hibernate.type.descriptor.java.BasicJavaType;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.hibernate.Internal;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.boot.cfgxml.spi.CfgXmlAccessService;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.spi.BasicTypeRegistration;
Expand Down
2 changes: 1 addition & 1 deletion ...amodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.hibernate.EntityNameResolver;
import org.hibernate.MappingException;
import org.hibernate.SessionFactoryObserver;
import org.hibernate.TimeZoneStorageStrategy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.boot.internal.DefaultCustomEntityDirtinessStrategy;
import org.hibernate.boot.internal.MetadataImpl;
import org.hibernate.boot.internal.StandardEntityNotFoundDelegate;
Expand Down