[4.2] Add automatic module name to the manifest

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ForeignKeys.java

@@ -11,7 +11,6 @@
 import org.hibernate.TransientObjectException;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.internal.NonNullableTransientDependencies;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SelfDirtinessTracker;

hibernate-reactive-core/src/main/java/org/hibernate/engine/internal/ReactivePersistenceContextAdapter.java → hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactivePersistenceContextAdapter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.engine.internal;
+package org.hibernate.reactive.engine.impl;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -36,7 +36,6 @@
 import org.hibernate.event.spi.PostLoadEventListener;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.reactive.engine.impl.ReactiveCallbackImpl;
 import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
@@ -106,7 +105,7 @@ public Object[] getDatabaseSnapshot(Object id, EntityPersister persister) throws
 		throw LOG.nonReactiveMethodCall( "reactiveGetDatabaseSnapshot" );
 	}
 
-	private static final Object[] NO_ROW = new Object[] {StatefulPersistenceContext.NO_ROW};
+	private static final Object[] NO_ROW = new Object[] {PersistenceContext.NO_ROW};
 
 	public CompletionStage<Object[]> reactiveGetDatabaseSnapshot(Object id, EntityPersister persister) throws HibernateException {
 		SessionImplementor session = (SessionImplementor) getSession();
@@ -720,7 +719,7 @@ public NaturalIdResolutions getNaturalIdResolutions() {
 	}
 
 	/**
-	 * Reactive version of {@link StatefulPersistenceContext#postLoad(JdbcValuesSourceProcessingState, Consumer)}
+	 * Reactive version of {@link org.hibernate.engine.internal.StatefulPersistenceContext#postLoad(JdbcValuesSourceProcessingState, Consumer)}
 	 */
 	public CompletionStage<Void> reactivePostLoad(
 			JdbcValuesSourceProcessingState processingState,
@@ -763,7 +762,7 @@ private CompletionStage<Void> processHolders(
 	}
 
 	/**
-	 * Reactive version of {@link StatefulPersistenceContext#processLoadedEntityHolder(EntityHolder, EventListenerGroup, PostLoadEvent, Callback, Consumer)}
+	 * Reactive version of {@link org.hibernate.engine.internal.StatefulPersistenceContext#processLoadedEntityHolder(EntityHolder, EventListenerGroup, PostLoadEvent, Callback, Consumer)}
 	 */
 	private CompletionStage<Void> processLoadedEntityHolder(
 			EntityHolder holder,

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -20,7 +20,7 @@
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.EffectiveEntityGraph;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityKey;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -14,7 +14,7 @@
 import org.hibernate.cache.spi.access.EntityDataAccess;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.CollectionEntry;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.PersistenceContext;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/StandardReactiveSelectExecutor.java

@@ -20,7 +20,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.TupleTransformer;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
 import org.hibernate.reactive.sql.exec.spi.ReactiveSelectExecutor;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveListResultsConsumer.java

@@ -13,7 +13,7 @@
 import java.util.function.Supplier;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.ResultListTransformer;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveSingleResultConsumer.java

@@ -8,7 +8,7 @@
 import java.util.concurrent.CompletionStage;
 
 import org.hibernate.Incubating;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
+import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
 import org.hibernate.reactive.sql.exec.spi.ReactiveValuesResultSet;

publish.gradle

@@ -10,6 +10,9 @@ java {
     withSourcesJar()
 }
 
+def moduleNameBase = project.name.startsWith( 'hibernate-' ) ? name.drop( 'hibernate-'.length() ): name
+def moduleName = "org.hibernate.$moduleNameBase".replace('-','.')
+
 jar {
     manifest {
         attributes(
@@ -22,6 +25,7 @@ jar {
                 'Implementation-Vendor': 'Hibernate.org',
                 'Implementation-Vendor-Id': 'org.hibernate',
                 'Implementation-Url': 'https://hibernate.org/reactive',
+				'Automatic-Module-Name': moduleName,
         )
     }
 }