Reorganize all Service Initializers

Author: Sanne

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/impl/ReactiveServiceInitiators.java

@@ -50,93 +50,128 @@
 /**
  * Provides the list of service initiators that Hibernate Reactive needs to integrate with Hibernate ORM.
  */
-// FIXME: We need to double check this class because I've deleted some services
 public final class ReactiveServiceInitiators {
 
 	private ReactiveServiceInitiators() {
 	}
 
 	public static final List<StandardServiceInitiator<?>> LIST = buildInitialServiceInitiatorList();
 
-	// Note that Quarkus uses a different list for the initialization of the services.
-	// If you update this list makes sure to check that reactive still works with Quarkus
-	// in native mode.
+	// Note that Quarkus uses a different list for the initialization of the services:
+	// If you update this list makes sure to check that reactive still works with Quarkus.
+	// Also: please try to maintain the same order as Hibernate ORM for sake of comparisons.
 	private static List<StandardServiceInitiator<?>> buildInitialServiceInitiatorList() {
 		final ArrayList<StandardServiceInitiator<?>> serviceInitiators = new ArrayList<>();
 
-		serviceInitiators.add( SqlScriptExtractorInitiator.INSTANCE );
-
-		serviceInitiators.add( ReactiveMutationExecutorServiceInitiator.INSTANCE );
-
-		// Definitely exclusive to Hibernate Reactive, as it marks the registry as Reactive:
-		serviceInitiators.add( ReactiveMarkerServiceInitiator.INSTANCE );
-
-		// Exclusive to Hibernate Reactive:
-		serviceInitiators.add( VertxInstanceInitiator.INSTANCE );
-		serviceInitiators.add( VertxContextInitiator.INSTANCE );
-
-		// Exclusive to Hibernate Reactive:
-		serviceInitiators.add( SqlClientPoolConfigurationInitiator.INSTANCE );
-		serviceInitiators.add( ReactiveConnectionPoolInitiator.INSTANCE );
-
-		// Custom for Hibernate Reactive:
+		// Custom for Hibernate Reactive: SessionFactoryBuilderService
 		serviceInitiators.add( ReactiveSessionFactoryBuilderInitiator.INSTANCE );
 
+		// Custom for Hibernate Reactive: IdentifierGeneratorFactory
+		serviceInitiators.add( ReactiveIdentifierGeneratorFactoryInitiator.INSTANCE);
+
+		// [standard] BytecodeProvider
 		serviceInitiators.add( BytecodeProviderInitiator.INSTANCE );
+
+		// [standard] ProxyFactoryFactory
 		serviceInitiators.add( ProxyFactoryFactoryInitiator.INSTANCE );
 
+		// [standard] CfgXmlAccessService
 		serviceInitiators.add( CfgXmlAccessServiceInitiator.INSTANCE );
+
+		// [standard] ConfigurationService
 		serviceInitiators.add( ConfigurationServiceInitiator.INSTANCE );
+
+		// [standard] PropertyAccessStrategyResolver
 		serviceInitiators.add( PropertyAccessStrategyResolverInitiator.INSTANCE );
 
-		// Custom for Hibernate Reactive:
+		// [standard] SqlScriptCommandExtractor
+		serviceInitiators.add( SqlScriptExtractorInitiator.INSTANCE );
+
+		// Custom for Hibernate Reactive: SchemaManagementTool
+		serviceInitiators.add( ReactiveSchemaManagementToolInitiator.INSTANCE );
+
+		// Custom for Hibernate Reactive: JdbcEnvironment
 		serviceInitiators.add( NoJdbcEnvironmentInitiator.INSTANCE );
 
+		// [standard] JndiService
 		serviceInitiators.add( JndiServiceInitiator.INSTANCE );
 
-		// Custom for Hibernate Reactive:
+		// Custom for Hibernate Reactive: PersisterClassResolver
 		serviceInitiators.add( ReactivePersisterClassResolverInitiator.INSTANCE );
+
+		// [standard] PersisterFactory
 		serviceInitiators.add( PersisterFactoryInitiator.INSTANCE );
 
-		// Custom for Hibernate Reactive:
+		// Custom for Hibernate Reactive: ConnectionProvider [disabled]
 		serviceInitiators.add( NoJdbcConnectionProviderInitiator.INSTANCE );
+
+		// Custom for Hibernate Reactive: MultiTenantConnectionProvider [disabled]
 		serviceInitiators.add( NoJdbcMultiTenantConnectionProviderInitiator.INSTANCE );
 
+		// [standard] DialectResolver
 		serviceInitiators.add( DialectResolverInitiator.INSTANCE );
 
-		//Custom for Hibernate Reactive:
+		// Custom for Hibernate Reactive: DialectFactory ; wraps the standard Dialects with ReactiveDialectWrapper
 		serviceInitiators.add( ReactiveDialectFactoryInitiator.INSTANCE );
+
+		// Custom for Hibernate Reactive: MutationExecutorService
+		serviceInitiators.add( ReactiveMutationExecutorServiceInitiator.INSTANCE );
+
+		// [standard] BatchBuilder
 		serviceInitiators.add( BatchBuilderInitiator.INSTANCE );
+
+		// [standard] JdbcServices
 		serviceInitiators.add( JdbcServicesInitiator.INSTANCE );
-		serviceInitiators.add( RefCursorSupportInitiator.INSTANCE );
 
-		// Custom for Hibernate Reactive:
-		serviceInitiators.add( ReactiveSchemaManagementToolInitiator.INSTANCE );
+		// [standard] RefCursorSupport
+		serviceInitiators.add( RefCursorSupportInitiator.INSTANCE );
 
-		// Custom for Hibernate Reactive:
-		serviceInitiators.add( ReactiveIdentifierGeneratorFactoryInitiator.INSTANCE);
+		// JtaPlatformResolver: REMOVED
 
-		// Custom for Hibernate Reactive:
+		// Custom for Hibernate Reactive: JtaPlatform [disabled]
 		serviceInitiators.add( NoJtaPlatformInitiator.INSTANCE );
 
+		// [standard] SessionFactoryServiceRegistryFactory
 		serviceInitiators.add( SessionFactoryServiceRegistryFactoryInitiator.INSTANCE );
 
+		// [standard] RegionFactory
 		serviceInitiators.add( RegionFactoryInitiator.INSTANCE );
 
+		// [standard] TransactionCoordinatorBuilder
 		serviceInitiators.add( TransactionCoordinatorBuilderInitiator.INSTANCE );
 
+		// [standard] ManagedBeanRegistry
 		serviceInitiators.add( ManagedBeanRegistryInitiator.INSTANCE );
+
+		// [standard] EntityCopyObserverFactory
 		serviceInitiators.add( EntityCopyObserverFactoryInitiator.INSTANCE );
 
-		//Custom for Hibernate Reactive:
+		// Custom for Hibernate Reactive: JdbcValuesMappingProducerProvider
 		serviceInitiators.add( ReactiveValuesMappingProducerProviderInitiator.INSTANCE );
 
-		//Custom for Hibernate Reactive:
+		//Custom for Hibernate Reactive: SqmMultiTableMutationStrategyProvider
 		serviceInitiators.add( ReactiveSqmMultiTableMutationStrategyProviderInitiator.INSTANCE );
 
-		// Default implementation
+		// [standard] JdbcParameterRenderer FIXME this will need to be replaced
 		serviceInitiators.add( JdbcParameterRendererInitiator.INSTANCE );
 
+		// --- end of services defined by Hibernate ORM
+
+		// --- custom ones follow:
+
+		// Definitely exclusive to Hibernate Reactive, as it marks this particular registry as Reactive:
+		serviceInitiators.add( ReactiveMarkerServiceInitiator.INSTANCE );
+
+		// Exclusive to Hibernate Reactive:
+		serviceInitiators.add( VertxInstanceInitiator.INSTANCE );
+		serviceInitiators.add( VertxContextInitiator.INSTANCE );
+
+		// Exclusive to Hibernate Reactive:
+		serviceInitiators.add( SqlClientPoolConfigurationInitiator.INSTANCE );
+		serviceInitiators.add( ReactiveConnectionPoolInitiator.INSTANCE );
+
+		// --- end of custom services.
+
 		serviceInitiators.trimToSize();
 
 		return unmodifiableList( serviceInitiators );