HHH-15799 - API/internal split for org.hibernate.cfg package

documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java

@@ -23,13 +23,13 @@ import org.hibernate.boot.Metadata;
 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;

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;

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;

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 <ul>
+ *     <li>a jar file</li>
+ *     <li>a zip file</li>
+ *     <li>an exploded directory</li>
+ *     <li>etc</li>
+ * </ul>
+ * <p/>
+ * Used mainly for scanning purposes via {@linkplain #visitArchive visitation}
  *
  * @author Steve Ebersole
  * @author Emmanuel Bernard

hibernate-core/src/main/java/org/hibernate/boot/archive/spi/package-info.java

@@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
- */
-
-/**
- * Defines the SPI for support of "scanning" of "archives".
- * <p>
- * Scanning might mean:<ul>
- *     <li>searching for classes/packages that define certain interfaces</li>
- *     <li>locating named resources</li>
- * </ul>
- * And "archive" might mean:<ul>
- *     <li>a {@code .jar} file</li>
- *     <li>an exploded directory</li>
- *     <li>an OSGi bundle</li>
- *     <li>etc</li>
- * </ul>
- */
-package org.hibernate.boot.archive.spi;

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;
 

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;
 

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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
  */

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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.CollectionType;
 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

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;
 

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;

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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * 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;

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;

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;

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;

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;

hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java

@@ -8,9 +8,9 @@ package org.hibernate.integrator.internal;
 
 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;
 

hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java

@@ -28,6 +28,7 @@ import org.hibernate.boot.CacheRegionDefinition;
 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.UnloadedClass;
 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;

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.Id;
 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
  */