fix up the Javadoc for SessionFactoryImplementor

Author: gavinking

hibernate-core/src/main/java/org/hibernate/SessionFactory.java

@@ -145,8 +145,9 @@ public interface SessionFactory extends EntityManagerFactory, Referenceable, Ser
 	String getJndiName();
 
 	/**
-	 * Obtain a {@linkplain SessionBuilder session builder} for creating
-	 * new {@link Session}s with certain customized options.
+	 * Obtain a {@linkplain org.hibernate.SessionBuilder session builder}
+	 * for creating new instances of {@link org.hibernate.Session} with
+	 * certain customized options.
 	 *
 	 * @return The session builder
 	 */
@@ -456,6 +457,26 @@ default boolean containsFetchProfileDefinition(String name) {
 		return getDefinedFilterNames().contains( name );
 	}
 
+	/**
+	 * The name assigned to this {@code SessionFactory}, if any.
+	 * <ul>
+	 * <li>When bootstrapping via JPA, this is the persistence unit name.
+	 * <li>Otherwise, the name may be specified by the configuration property
+	 *     {@value org.hibernate.cfg.PersistenceSettings#SESSION_FACTORY_NAME}.
+	 * </ul>
+	 * <p>
+	 * If {@value org.hibernate.cfg.PersistenceSettings#SESSION_FACTORY_NAME_IS_JNDI}
+	 * is enabled, then this name is used to bind this object to JNDI, unless
+	 * {@value org.hibernate.cfg.PersistenceSettings#SESSION_FACTORY_JNDI_NAME}
+	 * is also specified.
+	 *
+	 * @see org.hibernate.cfg.PersistenceSettings#SESSION_FACTORY_NAME
+	 * @see org.hibernate.cfg.PersistenceSettings#SESSION_FACTORY_NAME_IS_JNDI
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getPersistenceUnitName
+	 */
+	@Override
+	String getName();
+
 	/**
 	 * Get the {@linkplain SessionFactoryOptions options} used to build this factory.
 	 *

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java

@@ -52,24 +52,14 @@
  */
 public interface SessionFactoryImplementor extends MappingContext, SessionFactory {
 	/**
-	 * Get the UUID for this {@code SessionFactory}.
+	 * The UUID assigned to this {@code SessionFactory}.
 	 * <p>
-	 * The value is generated as a {@link java.util.UUID}, but kept as a String.
-	 *
-	 * @return The UUID for this {@code SessionFactory}.
+	 * The value is generated as a {@link java.util.UUID}, but kept as a string.
 	 *
 	 * @see org.hibernate.internal.SessionFactoryRegistry#getSessionFactory
 	 */
 	String getUuid();
 
-	/**
-	 * Access to the name (if one) assigned to the {@code SessionFactory}
-	 *
-	 * @return The name for the {@code SessionFactory}
-	 */
-	@Override
-	String getName();
-
 	/**
 	 * Overrides {@link SessionFactory#openSession()} to widen the return type:
 	 * this is useful for internal code depending on {@link SessionFactoryImplementor}
@@ -80,34 +70,65 @@ public interface SessionFactoryImplementor extends MappingContext, SessionFactor
 	@Override
 	SessionImplementor openSession();
 
+	/**
+	 * Obtain a {@linkplain org.hibernate.SessionBuilder session builder}
+	 * for creating new instances of {@link org.hibernate.Session} with
+	 * certain customized options.
+	 */
 	@Override
 	SessionBuilderImplementor withOptions();
 
 	/**
-	 * Get a non-transactional "current" session (used by hibernate-envers)
+	 * Get a non-transactional "current" session.
+	 *
+	 * @apiNote This is used by {@code hibernate-envers}.
 	 */
 	SessionImplementor openTemporarySession();
 
+	/**
+	 * Obtain the {@link CacheImplementor}.
+	 */
 	@Override
 	CacheImplementor getCache();
 
+	/**
+	 * Obtain the {@link StatisticsImplementor}.
+	 */
 	@Override
 	StatisticsImplementor getStatistics();
 
+	/**
+	 * Obtain the {@link TypeConfiguration}
+	 */
 	TypeConfiguration getTypeConfiguration();
 
+	/**
+	 * Obtain the {@link RuntimeMetamodelsImplementor}
+	 */
 	RuntimeMetamodelsImplementor getRuntimeMetamodels();
 
+	/**
+	 * Obtain the {@link MappingMetamodelImplementor}
+	 */
 	default MappingMetamodelImplementor getMappingMetamodel() {
 		return getRuntimeMetamodels().getMappingMetamodel();
 	}
 
+	/**
+	 * Obtain the {@link JpaMetamodel}
+	 */
 	default JpaMetamodel getJpaMetamodel() {
 		return getRuntimeMetamodels().getJpaMetamodel();
 	}
 
+	/**
+	 * Obtain the {@link QueryEngine}
+	 */
 	QueryEngine getQueryEngine();
 
+	/**
+	 * Obtain the {@link SqlTranslationEngine}
+	 */
 	SqlTranslationEngine getSqlTranslationEngine();
 
 	/**
@@ -123,11 +144,14 @@ default JpaMetamodel getJpaMetamodel() {
 	EventEngine getEventEngine();
 
 	/**
-	 * Retrieve fetch profile by name.
+	 * Retrieve a {@linkplain FetchProfile fetch profile} by name.
 	 *
 	 * @param name The name of the profile to retrieve.
 	 * @return The profile definition
+	 *
+	 * @deprecated Use {@link SqlTranslationEngine#getFetchProfile(String)}
 	 */
+	@Deprecated(since = "7.0", forRemoval = true)
 	FetchProfile getFetchProfile(String name);
 
 	/**
@@ -138,62 +162,86 @@ default JpaMetamodel getJpaMetamodel() {
 	@Deprecated(since = "7", forRemoval = true)
 	Generator getGenerator(String rootEntityName);
 
+	/**
+	 * Obtain the {@link EntityNotFoundDelegate}
+	 */
 	EntityNotFoundDelegate getEntityNotFoundDelegate();
 
+	/**
+	 * Register a {@link SessionFactoryObserver} of this factory.
+	 */
 	void addObserver(SessionFactoryObserver observer);
 
+	/**
+	 * Obtain the {@link CustomEntityDirtinessStrategy}
+	 */
 	//todo make a Service ?
 	CustomEntityDirtinessStrategy getCustomEntityDirtinessStrategy();
 
+	/**
+	 * Obtain the {@link CurrentTenantIdentifierResolver}
+	 */
 	//todo make a Service ?
 	CurrentTenantIdentifierResolver<Object> getCurrentTenantIdentifierResolver();
 
 	/**
-	 * The java type to use for a tenant identifier.
+	 * The {@link JavaType} to use for a tenant identifier.
 	 *
 	 * @since 6.4
 	 */
 	JavaType<Object> getTenantIdentifierJavaType();
 
 	/**
-	 * Access to the event listener groups.
+	 * Access to the {@linkplain EventListenerGroups event listener groups}.
 	 *
 	 * @since 7.0
 	 */
 	@Internal @Incubating
 	EventListenerGroups getEventListenerGroups();
 
 	/**
+	 * Obtain the {@link ParameterMarkerStrategy} service.
+	 *
 	 * @since 7.0
 	 */
 	@Incubating
 	ParameterMarkerStrategy getParameterMarkerStrategy();
 
 	/**
+	 * Obtain the {@link JdbcServices} service.
+	 *
 	 * @since 7.0
 	 */
 	@Incubating
 	JdbcValuesMappingProducerProvider getJdbcValuesMappingProducerProvider();
 
 	/**
+	 * Obtain the {@link EntityCopyObserverFactory} service.
+	 *
 	 * @since 7.0
 	 */
 	@Incubating
 	EntityCopyObserverFactory getEntityCopyObserver();
 
 	/**
+	 * Obtain the {@link ClassLoaderService}.
+	 *
 	 * @since 7.0
 	 */
 	@Incubating
 	ClassLoaderService getClassLoaderService();
 
 	/**
+	 * Obtain the {@link ManagedBeanRegistry} service.
+	 *
 	 * @since 7.0
 	 */
 	@Incubating
 	ManagedBeanRegistry getManagedBeanRegistry();
 
 	/**
+	 * Obtain the {@link EventListenerRegistry} service.
+	 *
 	 * @since 7.0
 	 */
 	@Incubating
@@ -207,16 +255,35 @@ default JpaMetamodel getJpaMetamodel() {
 	 */
 	WrapperOptions getWrapperOptions();
 
+	/**
+	 * Get the {@linkplain SessionFactoryOptions options} used to build this factory.
+	 */
 	@Override
 	SessionFactoryOptions getSessionFactoryOptions();
 
+	/**
+	 * Obtain the {@linkplain FilterDefinition definition of a filter} by name.
+	 *
+	 * @param filterName The name of a declared filter
+	 */
 	@Override
 	FilterDefinition getFilterDefinition(String filterName);
 
+	/**
+	 * Obtain a collection of {@link FilterDefinition}s representing all the
+	 * {@linkplain org.hibernate.annotations.FilterDef#autoEnabled auto-enabled}
+	 * filters.
+	 */
 	Collection<FilterDefinition> getAutoEnabledFilters();
 
+	/**
+	 * Obtain the {@link JdbcServices} service.
+	 */
 	JdbcServices getJdbcServices();
 
+	/**
+	 * Obtain the {@link SqlStringGenerationContext}.
+	 */
 	SqlStringGenerationContext getSqlStringGenerationContext();
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java

@@ -42,7 +42,8 @@ public static Map<String, FetchProfile> getFetchProfiles(
 		return fetchProfiles;
 	}
 
-	static void addFetchProfiles(MetadataImplementor bootMetamodel, RuntimeMetamodels runtimeMetamodels, Map<String, FetchProfile> fetchProfiles) {
+	static void addFetchProfiles(
+			MetadataImplementor bootMetamodel, RuntimeMetamodels runtimeMetamodels, Map<String, FetchProfile> fetchProfiles) {
 		for ( org.hibernate.mapping.FetchProfile mappingProfile : bootMetamodel.getFetchProfiles() ) {
 			final FetchProfile fetchProfile = createFetchProfile( runtimeMetamodels.getMappingMetamodel(), mappingProfile );
 			fetchProfiles.put( fetchProfile.getName(), fetchProfile );