From b2cddcc941533ec1dd5a946f12de461d6350b4a6 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Sun, 5 Feb 2023 15:01:50 +0100 Subject: [PATCH] More annotations and SPIs moved --- .../orm/runtime/boot/FastBootMetadataBuilder.java | 2 +- .../customized/QuarkusStrategySelectorBuilder.java | 10 +++++----- .../runtime/recording/PrevalidatedQuarkusMetadata.java | 2 +- .../orm/runtime/session/JTASessionOpener.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java index 3da73b237d06e..abefacaccf73c 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java @@ -46,7 +46,7 @@ import org.hibernate.boot.spi.MetadataBuilderImplementor; import org.hibernate.cache.internal.CollectionCacheInvalidator; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator; +import org.hibernate.boot.beanvalidation.BeanValidationIntegrator; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; import org.hibernate.engine.jdbc.dialect.spi.DialectFactory; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusStrategySelectorBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusStrategySelectorBuilder.java index 9dad0b3f40fb0..b9b2344098513 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusStrategySelectorBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusStrategySelectorBuilder.java @@ -26,11 +26,11 @@ import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; -import org.hibernate.type.FormatMapper; -import org.hibernate.type.jackson.JacksonJsonFormatMapper; -import org.hibernate.type.jackson.JacksonXmlFormatMapper; -import org.hibernate.type.jakartajson.JsonBJsonFormatMapper; -import org.hibernate.type.jaxb.JaxbXmlFormatMapper; +import org.hibernate.type.format.FormatMapper; +import org.hibernate.type.format.jackson.JacksonJsonFormatMapper; +import org.hibernate.type.format.jackson.JacksonXmlFormatMapper; +import org.hibernate.type.format.jakartajson.JsonBJsonFormatMapper; +import org.hibernate.type.format.jaxb.JaxbXmlFormatMapper; /** * Similar to {@link org.hibernate.boot.registry.selector.internal.StrategySelectorBuilder} but diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java index 0db6a86ba7ad6..563669d9debfd 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java @@ -22,7 +22,7 @@ import org.hibernate.boot.spi.BootstrapContext; import org.hibernate.boot.spi.MetadataBuildingOptions; import org.hibernate.boot.spi.MetadataImplementor; -import org.hibernate.cfg.annotations.NamedEntityGraphDefinition; +import org.hibernate.boot.model.NamedEntityGraphDefinition; import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.Component; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java index a9e22a266849e..581e6842b481d 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java @@ -27,7 +27,7 @@ public static JTASessionOpener create(SessionFactory sessionFactory) { } } - private static SessionBuilder createOptions(SessionFactory sessionFactory) { + private static SessionBuilder createOptions(SessionFactory sessionFactory) { return sessionFactory.withOptions() .autoClose(true) // .owner() is deprecated as well, so it looks like we need to rely on deprecated code... .connectionHandlingMode( @@ -36,15 +36,15 @@ private static SessionBuilder createOptions(SessionFactory sessionFactory) { } private final SessionFactory sessionFactory; - private final SessionBuilder cachedOptions; + private final SessionBuilder cachedOptions; - public JTASessionOpener(SessionFactory sessionFactory, SessionBuilder cachedOptions) { + public JTASessionOpener(SessionFactory sessionFactory, SessionBuilder cachedOptions) { this.sessionFactory = sessionFactory; this.cachedOptions = cachedOptions; } public Session openSession() { - SessionBuilder options = cachedOptions != null ? cachedOptions : createOptions(sessionFactory); + SessionBuilder options = cachedOptions != null ? cachedOptions : createOptions(sessionFactory); return options.openSession(); } }