diff --git a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java index 31a382d50c..35a3344546 100644 --- a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java @@ -23,13 +23,13 @@ import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.SessionFactoryBuilder; +import org.hibernate.boot.beanvalidation.BeanValidationIntegrator; import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.internal.DefaultAutoFlushEventListener; import org.hibernate.event.internal.DefaultMergeEventListener; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/package-info.java new file mode 100644 index 0000000000..fdcfb40a3f --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/package-info.java @@ -0,0 +1,13 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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. + */ + +/** + * Support for {@linkplain org.hibernate.boot.archive.scan scanning} + * of {@linkplain org.hibernate.boot.archive.spi.ArchiveDescriptor archives} + * for discovery of managed resources. + */ +package org.hibernate.boot.archive; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/package-info.java new file mode 100644 index 0000000000..b18afca1c3 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/package-info.java @@ -0,0 +1,16 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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. + */ + +/** + * Support for scanning {@linkplain org.hibernate.boot.archive.spi.ArchiveDescriptor archives} + * to discover managed classes and named resources. + * + * @see org.hibernate.boot.archive.scan.spi.ScanResult + * + * @author Steve Ebersole + */ +package org.hibernate.boot.archive.scan; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java index 809d99411a..37298fe060 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/ArchiveDescriptor.java @@ -7,7 +7,14 @@ package org.hibernate.boot.archive.spi; /** - * Contract for visiting an archive, which might be a jar, a zip, an exploded directory, etc. + * Models a logical archive, which might be + *

+ * Used mainly for scanning purposes via {@linkplain #visitArchive visitation} * * @author Steve Ebersole * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/package-info.java deleted file mode 100644 index 21fbc1e452..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/spi/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -/** - * Defines the SPI for support of "scanning" of "archives". - *

- * Scanning might mean:

- * And "archive" might mean: - */ -package org.hibernate.boot.archive.spi; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ActivationContext.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ActivationContext.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java index 165b9c0945..e263ef4787 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ActivationContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ActivationContext.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java index 6cc0c93ce5..afbca6d7d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import java.util.HashSet; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java index c987dee521..3a9f6267df 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/DuplicationStrategyImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java similarity index 83% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/DuplicationStrategyImpl.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java index 840302ad10..ae3f338e1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/DuplicationStrategyImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/DuplicationStrategyImpl.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import org.hibernate.event.service.spi.DuplicationStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java index 4d0099e484..3dea016897 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java @@ -2,21 +2,21 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.validation.groups.Default; import org.hibernate.HibernateException; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.boot.spi.ClassLoaderAccess; import org.hibernate.internal.util.collections.CollectionHelper; +import jakarta.validation.groups.Default; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java index c56e299b60..1058a19823 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/HibernateTraversableResolver.java @@ -2,15 +2,14 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; + import java.lang.annotation.ElementType; import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import jakarta.validation.Path; -import jakarta.validation.TraversableResolver; import org.hibernate.AssertionFailure; import org.hibernate.Hibernate; @@ -20,6 +19,9 @@ import org.hibernate.type.CompositeType; import org.hibernate.type.Type; +import jakarta.validation.Path; +import jakarta.validation.TraversableResolver; + /** * Use Hibernate metadata to ignore cascade on entities. * cascade on embeddable objects or collection of embeddable objects are accepted diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/IntegrationException.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java similarity index 79% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/IntegrationException.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java index 478861a503..6711dbf300 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/IntegrationException.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/IntegrationException.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java index 8b42700b36..f8b67678af 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import java.util.Arrays; import java.util.Collection; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java rename to hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java index c6eb913b4a..7961dbb712 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java @@ -2,9 +2,9 @@ * Hibernate, Relational Persistence for Idiomatic Java * * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.beanvalidation; +package org.hibernate.boot.beanvalidation; import java.util.Locale; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/package-info.java new file mode 100644 index 0000000000..49cfbd6315 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/package-info.java @@ -0,0 +1,13 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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. + */ + +/** + * Support for integrating Jakarta Bean Validation + * + * @author Steve Ebersole + */ +package org.hibernate.boot.beanvalidation; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/package-info.java new file mode 100644 index 0000000000..5f22cc589e --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/package-info.java @@ -0,0 +1,15 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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. + */ + +/** + * Support for processing and handling Hibernate {@code cfg.xml} files. + * + * @see org.hibernate.boot.cfgxml.spi.LoadedConfig + * + * @author Steve Ebersole + */ +package org.hibernate.boot.cfgxml; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/package-info.java new file mode 100644 index 0000000000..fcc6a4a572 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/package-info.java @@ -0,0 +1,13 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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. + */ + +/** + * JAXB support for {@code orm.xml} and {@code hbm.xml} mapping files + * + * @author Steve Ebersole + */ +package org.hibernate.boot.jaxb; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/query/package-info.java new file mode 100644 index 0000000000..3cbb8f8dbf --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/package-info.java @@ -0,0 +1,13 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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. + */ + +/** + * Support for handling named-queries + * + * @author Steve Ebersole + */ +package org.hibernate.boot.query; diff --git a/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java index 777d101903..258464bc24 100644 --- a/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java @@ -8,9 +8,9 @@ import java.util.LinkedHashSet; +import org.hibernate.boot.beanvalidation.BeanValidationIntegrator; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cache.internal.CollectionCacheInvalidator; -import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator; import org.hibernate.integrator.spi.Integrator; import org.hibernate.integrator.spi.IntegratorService; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java index d7c2e23af3..55a84e033b 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java @@ -28,6 +28,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.boot.archive.scan.internal.StandardScanOptions; +import org.hibernate.boot.beanvalidation.BeanValidationIntegrator; import org.hibernate.boot.cfgxml.spi.CfgXmlAccessService; import org.hibernate.boot.cfgxml.spi.LoadedConfig; import org.hibernate.boot.cfgxml.spi.MappingReference; @@ -53,7 +54,6 @@ import org.hibernate.bytecode.enhance.spi.UnloadedField; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.integrator.spi.Integrator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java index 20f3800674..d175ec3d6e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java @@ -1,5 +1,15 @@ package org.hibernate.orm.test.annotations.manytoone; +import org.hibernate.boot.beanvalidation.ValidationMode; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.cfg.Configuration; + +import org.hibernate.testing.DialectChecks; +import org.hibernate.testing.RequiresDialectFeature; +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.junit.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -8,16 +18,6 @@ import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotNull; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.beanvalidation.ValidationMode; - -import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; - /** * @author Andrea Boriero */