HHH-15216 Revert moving classes out of the internal package

hibernate · Sep 5, 2022 · 4dc69d4 · 4dc69d4
1 parent 146038c
commit 4dc69d4
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -30,7 +30,7 @@
 import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenMetadataProvider;
+import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenMetadataProvider;
 import org.hibernate.dialect.function.SQLFunction;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.jpa.internal.MutableJpaComplianceImpl;

diff --git a/...bernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/...bernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -34,7 +34,7 @@
 import org.hibernate.cfg.AnnotationBinder;
 import org.hibernate.cfg.InheritanceState;
 import org.hibernate.cfg.annotations.reflection.AttributeConverterDefinitionCollector;
-import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenMetadataProvider;
+import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenMetadataProvider;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 

diff --git a/...ion/JPAXMLOverriddenAnnotationReader.java → ...nal/JPAXMLOverriddenAnnotationReader.java b/...ion/JPAXMLOverriddenAnnotationReader.java → ...nal/JPAXMLOverriddenAnnotationReader.java
@@ -4,7 +4,7 @@
  * 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>.
  */
-package org.hibernate.cfg.annotations.reflection;
+package org.hibernate.cfg.annotations.reflection.internal;
 
 import java.beans.Introspector;
 import java.lang.annotation.Annotation;
@@ -179,15 +179,14 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbStoredProcedureParameter;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbTable;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbTableGenerator;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbTransient;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbUniqueConstraint;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbVersion;
 import org.hibernate.boot.jaxb.mapping.spi.LifecycleCallbackContainer;
 import org.hibernate.boot.jaxb.mapping.spi.ManagedType;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
-import org.hibernate.cfg.annotations.reflection.internal.PropertyMappingElementCollector;
+import org.hibernate.cfg.annotations.reflection.PersistentAttributeFilter;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;

diff --git a/...ion/JPAXMLOverriddenMetadataProvider.java → ...nal/JPAXMLOverriddenMetadataProvider.java b/...ion/JPAXMLOverriddenMetadataProvider.java → ...nal/JPAXMLOverriddenMetadataProvider.java
@@ -4,7 +4,7 @@
  * 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>.
  */
-package org.hibernate.cfg.annotations.reflection;
+package org.hibernate.cfg.annotations.reflection.internal;
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.ArrayList;

diff --git a/...va/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java b/...va/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java
@@ -33,7 +33,7 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbVersion;
 import org.hibernate.boot.jaxb.mapping.spi.LifecycleCallback;
 import org.hibernate.boot.jaxb.mapping.spi.LifecycleCallbackContainer;
-import org.hibernate.boot.jaxb.mapping.spi.PersistentAttribute;import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenAnnotationReader;
+import org.hibernate.boot.jaxb.mapping.spi.PersistentAttribute;
 
 /**
  * Reproduces what we used to do with a {@code List<Element>} in {@link JPAXMLOverriddenAnnotationReader},

diff --git a/...fg/annotations/reflection/XMLContext.java → ...tions/reflection/internal/XMLContext.java b/...fg/annotations/reflection/XMLContext.java → ...tions/reflection/internal/XMLContext.java
@@ -4,7 +4,7 @@
  * 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>.
  */
-package org.hibernate.cfg.annotations.reflection;
+package org.hibernate.cfg.annotations.reflection.internal;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -30,6 +30,7 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
+import org.hibernate.cfg.annotations.reflection.AttributeConverterDefinitionCollector;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;

diff --git a/.../java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java b/.../java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java
@@ -8,8 +8,8 @@
 
 import org.hibernate.annotations.Columns;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappings;
-import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenAnnotationReader;
-import org.hibernate.cfg.annotations.reflection.XMLContext;
+import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenAnnotationReader;
+import org.hibernate.cfg.annotations.reflection.internal.XMLContext;
 import org.hibernate.internal.util.xml.XMLMappingHelper;
 
 import org.hibernate.testing.boot.BootstrapContextImpl;

diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
@@ -7,7 +7,7 @@
 package org.hibernate.test.annotations.reflection;
 
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappings;
-import org.hibernate.cfg.annotations.reflection.XMLContext;
+import org.hibernate.cfg.annotations.reflection.internal.XMLContext;
 import org.hibernate.internal.util.xml.XMLMappingHelper;
 
 import org.hibernate.testing.TestForIssue;

diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
@@ -11,8 +11,8 @@
 import java.lang.reflect.AnnotatedElement;
 
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappings;
-import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenAnnotationReader;
-import org.hibernate.cfg.annotations.reflection.XMLContext;
+import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenAnnotationReader;
+import org.hibernate.cfg.annotations.reflection.internal.XMLContext;
 import org.hibernate.internal.util.xml.XMLMappingHelper;
 
 import org.hibernate.testing.boot.BootstrapContextImpl;