HHH-6796 Make the service configuration logic being executed by the o…

…wning service registry

hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java

@@ -43,6 +43,7 @@
 import org.hibernate.service.spi.ServiceBinding;
 import org.hibernate.service.spi.ServiceException;
 import org.hibernate.service.spi.ServiceInitiator;
+import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.Startable;
 import org.hibernate.service.spi.Stoppable;
@@ -156,15 +157,26 @@ private <R extends Service> R initializeService(ServiceBinding<R> serviceBinding
 			return null;
 		}
 
-		// PHASE 2 : configure service (***potentially recursive***)
-		configureService( service );
+		// PHASE 2 : inject service (***potentially recursive***)
+		injectService( service );
 
-		// PHASE 3 : Start service
+		// PHASE 3 : configure service
+		serviceBinding.getServiceRegistry().configureService( service );
+
+		// PHASE 4 : Start service
 		startService( serviceBinding );
 
 		return service;
 	}
 
+	protected <T extends Service> void injectService(T service) {
+		applyInjections( service );
+
+		if ( ServiceRegistryAwareService.class.isInstance( service ) ) {
+			( (ServiceRegistryAwareService) service ).injectServices( this );
+		}
+	}
+
 	@SuppressWarnings( {"unchecked"})
 	protected <R extends Service> R createService(ServiceBinding<R> serviceBinding) {
 		final ServiceInitiator<R> serviceInitiator = serviceBinding.getServiceInitiator();
@@ -188,8 +200,6 @@ protected <R extends Service> R createService(ServiceBinding<R> serviceBinding)
 		}
 	}
 
-	protected abstract <T extends Service> void configureService(T service);
-
 	protected <T extends Service> void applyInjections(T service) {
 		try {
 			for ( Method method : service.getClass().getMethods() ) {

hibernate-core/src/main/java/org/hibernate/service/internal/BootstrapServiceRegistryImpl.java

@@ -116,4 +116,9 @@ public <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiato
 		throw new ServiceException( "Boot-strap registry should only contain directly built services" );
 	}
 
+	@Override
+	public <R extends Service> void configureService(R service) {
+		//nothing do to for bootstrap style services
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java

@@ -96,11 +96,7 @@ else if ( configuration != null ) {
 	}
 
 	@Override
-	protected <T extends Service> void configureService(T service) {
-		applyInjections( service );
-
-		if ( ServiceRegistryAwareService.class.isInstance( service ) ) {
-			( (ServiceRegistryAwareService) service ).injectServices( this );
-		}
+	public <T extends Service> void configureService(T service) {
+		//TODO nothing to do here or should we inject SessionFactory properties?
 	}
 }

hibernate-core/src/main/java/org/hibernate/service/internal/StandardServiceRegistryImpl.java

@@ -70,13 +70,7 @@ public <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiato
 	}
 
 	@Override
-	protected <T extends Service> void configureService(T service) {
-		applyInjections( service );
-
-		if ( ServiceRegistryAwareService.class.isInstance( service ) ) {
-			( (ServiceRegistryAwareService) service ).injectServices( this );
-		}
-
+	public <T extends Service> void configureService(T service) {
 		if ( Configurable.class.isInstance( service ) ) {
 			( (Configurable) service ).configure( configurationValues );
 		}

hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java

@@ -37,6 +37,7 @@ public final class ServiceBinding<R extends Service> {
 
 	public static interface OwningRegistry {
 		public <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiator);
+		public <R extends Service> void configureService(R service);
 	}
 
 	private final OwningRegistry serviceRegistry;