HHH-16290 - Mark o.h.persister.entity and o.h.persister.collection as internal

Author: sebersole

hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java

@@ -19,12 +19,12 @@
 import org.hibernate.engine.spi.Status;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.NaturalIdMapping;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.AttributeMappingsList;
 import org.hibernate.persister.entity.EntityPersister;
 
 import static org.hibernate.engine.internal.Versioning.getVersion;

hibernate-core/src/main/java/org/hibernate/persister/entity/AttributeMappingsList.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsList.java

@@ -1,16 +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
+ * 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.persister.entity;
+package org.hibernate.metamodel.mapping;
 
 import java.util.function.Consumer;
 
 import org.hibernate.Incubating;
 import org.hibernate.internal.util.IndexedConsumer;
-import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.internal.ImmutableAttributeMappingList;
 
 /**
  * This is essentially a List of AttributeMapping(s), but exposing
@@ -21,9 +21,10 @@
  * And additional reason for the custom interface is to allow
  * custom implementations which can be highly optimised as
  * necessary for our specific needs; for example the
- * implementation {@link org.hibernate.persister.internal.ImmutableAttributeMappingList}
+ * implementation {@link ImmutableAttributeMappingList}
  * is able to avoid caching problems related to JDK-8180450, which would
  * not have been possible with a standard generic container.
+ *
  * @since 6.2
  */
 @Incubating

hibernate-core/src/main/java/org/hibernate/persister/entity/AttributeMappingsMap.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AttributeMappingsMap.java

@@ -1,34 +1,34 @@
 /*
  * 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
+ * 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.persister.entity;
+package org.hibernate.metamodel.mapping;
 
 import java.util.LinkedHashMap;
 import java.util.Objects;
 import java.util.function.Consumer;
 
 import org.hibernate.Incubating;
-import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.persister.internal.EmptyAttributeMappingsMap;
-import org.hibernate.persister.internal.ImmutableAttributeMappingsMap;
+import org.hibernate.metamodel.mapping.internal.EmptyAttributeMappingsMap;
+import org.hibernate.metamodel.mapping.internal.ImmutableAttributeMappingsMap;
 
 /**
- * Similarly to @{@link AttributeMappingsList}, this is essentially
+ * Similar to {@link AttributeMappingsList}, this is essentially
  * an immutable Map of AttributeMapping(s), allowing iteration of
  * all mappings but also retrieval by name (a String key).
  * Exposing a custom interface is more suitable to our needs than
  * reusing the stock Map API; it expresses the immutable nature of
- * this structure, and might allows us to extend it with additional
+ * this structure, and might allow us to extend it with additional
  * convenience methods such as needs evolve.
  * And additional reason for the custom interface is to allow
  * custom implementations which can be highly optimised as
  * necessary for our specific needs; for example the
- * implementation @{@link ImmutableAttributeMappingsMap}
+ * implementation {@link ImmutableAttributeMappingsMap}
  * is able to avoid caching problems related to JDK-8180450, which would
  * not have been possible with a standard generic container.
+ *
  * @since 6.2
  */
 @Incubating

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java

@@ -26,8 +26,6 @@
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.spi.EntityRepresentationStrategy;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
-import org.hibernate.persister.entity.AttributeMappingsList;
-import org.hibernate.persister.entity.AttributeMappingsMap;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java

@@ -9,7 +9,6 @@
 import java.util.function.Consumer;
 
 import org.hibernate.internal.util.IndexedConsumer;
-import org.hibernate.persister.entity.AttributeMappingsList;
 import org.hibernate.sql.results.graph.FetchableContainer;
 import org.hibernate.type.descriptor.java.JavaType;
 

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java

@@ -31,6 +31,7 @@
 import org.hibernate.mapping.Value;
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -45,10 +46,7 @@
 import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.persister.entity.AttributeMappingsList;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.internal.MutableAttributeMappingList;
 import org.hibernate.property.access.internal.PropertyAccessStrategyBackRefImpl;
 import org.hibernate.property.access.spi.Getter;
 import org.hibernate.property.access.spi.PropertyAccess;

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java

@@ -45,7 +45,6 @@
 import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.internal.MutableAttributeMappingList;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;

hibernate-core/src/main/java/org/hibernate/persister/internal/EmptyAttributeMappingsMap.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmptyAttributeMappingsMap.java

@@ -2,15 +2,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>.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
  */
-package org.hibernate.persister.internal;
+package org.hibernate.metamodel.mapping.internal;
 
 import java.util.Collections;
 import java.util.function.Consumer;
 
 import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.persister.entity.AttributeMappingsMap;
+import org.hibernate.metamodel.mapping.AttributeMappingsMap;
 
 public final class EmptyAttributeMappingsMap implements AttributeMappingsMap {
 

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java

@@ -29,7 +29,6 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.internal.MutableAttributeMappingList;
 import org.hibernate.property.access.internal.PropertyAccessStrategyMapImpl;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.spi.NavigablePath;

hibernate-core/src/main/java/org/hibernate/persister/internal/ImmutableAttributeMappingList.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingList.java

@@ -1,10 +1,10 @@
 /*
  * 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
+ * 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.persister.internal;
+package org.hibernate.metamodel.mapping.internal;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -13,7 +13,7 @@
 
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.persister.entity.AttributeMappingsList;
+import org.hibernate.metamodel.mapping.AttributeMappingsList;
 
 public final class ImmutableAttributeMappingList implements AttributeMappingsList {
 

hibernate-core/src/main/java/org/hibernate/persister/internal/ImmutableAttributeMappingsMap.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ImmutableAttributeMappingsMap.java

@@ -1,10 +1,10 @@
 /*
  * 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
+ * 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.persister.internal;
+package org.hibernate.metamodel.mapping.internal;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -13,7 +13,7 @@
 import java.util.function.Consumer;
 
 import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.persister.entity.AttributeMappingsMap;
+import org.hibernate.metamodel.mapping.AttributeMappingsMap;
 
 public final class ImmutableAttributeMappingsMap implements AttributeMappingsMap {
 

hibernate-core/src/main/java/org/hibernate/persister/internal/MutableAttributeMappingList.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java

@@ -1,10 +1,10 @@
 /*
  * 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
+ * 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.persister.internal;
+package org.hibernate.metamodel.mapping.internal;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -13,9 +13,8 @@
 
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
-import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
-import org.hibernate.persister.entity.AttributeMappingsList;
 import org.hibernate.sql.results.graph.Fetchable;
 
 /**

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java

@@ -16,7 +16,6 @@
 import org.hibernate.metamodel.mapping.SelectableMappings;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.internal.MutableAttributeMappingList;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupProducer;

hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java

@@ -23,6 +23,7 @@
 import org.hibernate.FetchMode;
 import org.hibernate.Filter;
 import org.hibernate.HibernateException;
+import org.hibernate.Internal;
 import org.hibernate.LockOptions;
 import org.hibernate.MappingException;
 import org.hibernate.QueryException;
@@ -144,6 +145,7 @@
  * @see BasicCollectionPersister
  * @see OneToManyPersister
  */
+@Internal
 public abstract class AbstractCollectionPersister
 		implements SQLLoadableCollection, PluralAttributeMappingImpl.Aware, CollectionMutationTarget, CollectionMetadata {
 

hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java

@@ -7,6 +7,7 @@
 package org.hibernate.persister.collection;
 
 import org.hibernate.HibernateException;
+import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.access.CollectionDataAccess;
@@ -67,6 +68,7 @@
  *
  * @author Gavin King
  */
+@Internal
 public class BasicCollectionPersister extends AbstractCollectionPersister {
 	private final RowMutationOperations rowMutationOperations;
 	private final InsertRowsCoordinator insertRowsCoordinator;

hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java

@@ -11,6 +11,7 @@
 import java.util.function.Consumer;
 
 import org.hibernate.HibernateException;
+import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.access.CollectionDataAccess;
@@ -88,6 +89,7 @@
  * @author Gavin King
  * @author Brett Meyer
  */
+@Internal
 public class OneToManyPersister extends AbstractCollectionPersister {
 	private final RowMutationOperations rowMutationOperations;
 

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -149,6 +149,8 @@
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.metamodel.mapping.Association;
 import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.AttributeMappingsList;
+import org.hibernate.metamodel.mapping.AttributeMappingsMap;
 import org.hibernate.metamodel.mapping.AttributeMetadata;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
@@ -198,7 +200,7 @@
 import org.hibernate.persister.entity.mutation.UpdateCoordinator;
 import org.hibernate.persister.entity.mutation.UpdateCoordinatorNoOp;
 import org.hibernate.persister.entity.mutation.UpdateCoordinatorStandard;
-import org.hibernate.persister.internal.ImmutableAttributeMappingList;
+import org.hibernate.metamodel.mapping.internal.ImmutableAttributeMappingList;
 import org.hibernate.persister.internal.SqlFragmentPredicate;
 import org.hibernate.persister.spi.PersisterCreationContext;
 import org.hibernate.property.access.spi.PropertyAccess;
@@ -306,6 +308,7 @@
  *
  * @author Gavin King
  */
+@Internal
 public abstract class AbstractEntityPersister
 		implements OuterJoinLoadable, ClassMetadata, UniqueKeyLoadable,
 				SQLLoadable, LazyPropertyInitializer, PostInsertIdentityPersister, Lockable,

hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java

@@ -6,9 +6,15 @@
  */
 package org.hibernate.persister.entity;
 
+import org.hibernate.Remove;
+
 /**
  * @author Gavin King
+ *
+ * @deprecated Replaced by {@link org.hibernate.metamodel.mapping.EntityMappingType}
  */
+@Deprecated(since = "6", forRemoval = true)
+@Remove
 public class BasicEntityPropertyMapping extends AbstractPropertyMapping {
 
 	private final AbstractEntityPersister persister;

hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.persister.entity;
 
+import org.hibernate.Internal;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
@@ -14,6 +15,7 @@
 /**
  * Operations for searching an array of property values for modified elements.
  */
+@Internal
 class DirtyHelper {
 	/**
 	 * Determine if any of the given field values are dirty, returning an array containing

hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java

@@ -13,6 +13,7 @@
 import java.util.Objects;
 
 import org.hibernate.HibernateException;
+import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -34,10 +35,9 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
 /**
- * TODO : javadoc
- *
  * @author Steve Ebersole
  */
+@Internal
 public class DiscriminatorType<T> extends AbstractType implements BasicType<T>, BasicValueConverter<T, Object> {
 	private final BasicType<Object> underlyingType;
 	private final Loadable persister;

hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorValueDetailsImpl.java

@@ -6,12 +6,14 @@
  */
 package org.hibernate.persister.entity;
 
+import org.hibernate.Internal;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 
 /**
  * @author Steve Ebersole
  */
+@Internal
 public class DiscriminatorValueDetailsImpl implements EntityDiscriminatorMapping.DiscriminatorValueDetails {
 	private final Object value;
 	private final String jdbcLiteral;

hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java

@@ -18,6 +18,7 @@
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
+import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.cache.spi.access.EntityDataAccess;
@@ -96,6 +97,7 @@
  *
  * @author Gavin King
  */
+@Internal
 public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
 	private static final Logger log = Logger.getLogger( JoinedSubclassEntityPersister.class );