From 011d7e1114adfceca6e54e340ed814f414fb4ce6 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 8 Feb 2011 11:27:27 -0600 Subject: [PATCH] HHH-5903 - Rename ServicesRegistry to ServiceRegistry --- .../src/main/java/org/hibernate/cfg/Configuration.java | 5 ++--- .../cfg/internal/ServicesRegistryBootstrap.java | 6 +++--- .../engine/jdbc/internal/JdbcServicesInitiator.java | 4 ++-- .../java/org/hibernate/impl/SessionFactoryImpl.java | 6 +++--- .../main/java/org/hibernate/jmx/HibernateService.java | 1 - .../internal/ClassLoaderServiceInitiator.java | 4 ++-- ...vicesRegistryImpl.java => ServiceRegistryImpl.java} | 8 ++++---- .../service/internal/ServicesInitializer.java | 10 +++++----- .../internal/ConnectionProviderInitiator.java | 4 ++-- .../jdbc/dialect/internal/DialectFactoryInitiator.java | 4 ++-- .../dialect/internal/DialectResolverInitiator.java | 4 ++-- .../service/jmx/internal/JmxServiceInitiator.java | 4 ++-- .../service/jndi/internal/JndiServiceInitiator.java | 4 ++-- .../jta/platform/internal/JtaPlatformInitiator.java | 4 ++-- .../org/hibernate/service/spi/ServiceInitiator.java | 2 +- .../{ServicesRegistry.java => ServiceRegistry.java} | 2 +- ...reService.java => ServiceRegistryAwareService.java} | 10 +++++----- .../test/cfg/internal/ServiceBootstrappingTest.java | 9 +++------ .../internal/TestServicesRegistryBootstrapping.java | 4 ++-- .../hibernate/test/common/ServiceRegistryHolder.java | 10 ++++------ .../java/org/hibernate/testing/junit/UnitTestCase.java | 4 ++-- .../testing/junit/functional/ExecutionEnvironment.java | 4 ++-- .../functional/annotations/HibernateTestCase.java | 4 ++-- .../main/java/org/hibernate/ejb/Ejb3Configuration.java | 6 ++---- .../org/hibernate/ejb/EntityManagerFactoryImpl.java | 7 ++----- .../infinispan/AbstractNonFunctionalTestCase.java | 4 ---- .../test/cache/infinispan/util/CacheTestUtil.java | 2 -- 27 files changed, 59 insertions(+), 77 deletions(-) rename hibernate-core/src/main/java/org/hibernate/service/internal/{ServicesRegistryImpl.java => ServiceRegistryImpl.java} (94%) rename hibernate-core/src/main/java/org/hibernate/service/spi/{ServicesRegistry.java => ServiceRegistry.java} (97%) rename hibernate-core/src/main/java/org/hibernate/service/spi/{ServicesRegistryAwareService.java => ServiceRegistryAwareService.java} (79%) diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java index da55a6c0ee..578cfc32dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java @@ -152,8 +152,7 @@ import org.hibernate.mapping.TypeDef; import org.hibernate.mapping.UniqueKey; import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.secure.JACCConfiguration; -import org.hibernate.service.spi.ServicesRegistry; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.IndexMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; @@ -1823,7 +1822,7 @@ public class Configuration implements Serializable { * * @throws HibernateException usually indicates an invalid configuration or invalid mapping information */ - public SessionFactory buildSessionFactory(ServicesRegistry serviceRegistry) throws HibernateException { + public SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throws HibernateException { log.debug( "Preparing to build session factory with filters : " + filterDefinitions ); secondPassCompile(); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java b/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java index 5c7b459b11..327e43adc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java @@ -29,7 +29,7 @@ import java.util.Map; import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator; import org.hibernate.service.classloading.internal.ClassLoaderServiceInitiator; -import org.hibernate.service.internal.ServicesRegistryImpl; +import org.hibernate.service.internal.ServiceRegistryImpl; import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; import org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator; import org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator; @@ -60,8 +60,8 @@ public class ServicesRegistryBootstrap { //serviceInitiators.add( TransactionFactoryInitiator.INSTANCE ); } - public ServicesRegistryImpl initiateServicesRegistry(Map configurationValues) { - final ServicesRegistryImpl servicesRegistry = new ServicesRegistryImpl( serviceInitiators ); + public ServiceRegistryImpl initiateServicesRegistry(Map configurationValues) { + final ServiceRegistryImpl servicesRegistry = new ServiceRegistryImpl( serviceInitiators ); servicesRegistry.initialize( configurationValues ); return servicesRegistry; } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java index b97c9f9756..ab50850ded 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java @@ -26,8 +26,8 @@ package org.hibernate.engine.jdbc.internal; import java.util.Map; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.service.spi.ServiceInitiator; +import org.hibernate.service.spi.ServiceRegistry; /** * Standard initiator for the standard {@link JdbcServices} service @@ -47,7 +47,7 @@ public class JdbcServicesInitiator implements ServiceInitiator { /** * {@inheritDoc} */ - public JdbcServices initiateService(Map configValues, ServicesRegistry registry) { + public JdbcServices initiateService(Map configValues, ServiceRegistry registry) { return new JdbcServicesImpl(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java index 7302d3f9bc..6a004835ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java @@ -113,7 +113,7 @@ import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.Queryable; import org.hibernate.pretty.MessageHelper; import org.hibernate.proxy.EntityNotFoundDelegate; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.stat.ConcurrentStatisticsImpl; import org.hibernate.stat.Statistics; import org.hibernate.stat.StatisticsImplementor; @@ -174,7 +174,7 @@ public final class SessionFactoryImpl implements SessionFactory, SessionFactoryI private final transient Map fetchProfiles; private final transient Map imports; private final transient Interceptor interceptor; - private final transient ServicesRegistry serviceRegistry; + private final transient ServiceRegistry serviceRegistry; private final transient Settings settings; private final transient Properties properties; private transient SchemaExport schemaExport; @@ -199,7 +199,7 @@ public final class SessionFactoryImpl implements SessionFactory, SessionFactoryI public SessionFactoryImpl( Configuration cfg, Mapping mapping, - ServicesRegistry serviceRegistry, + ServiceRegistry serviceRegistry, Settings settings, EventListeners listeners, SessionFactoryObserver observer) throws HibernateException { diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java b/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java index a4946c1398..aab2d2b83e 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java @@ -13,7 +13,6 @@ import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.cfg.internal.ServicesRegistryBootstrap; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.internal.util.jndi.JndiHelper; import org.hibernate.util.ExternalSessionFactoryConfig; diff --git a/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceInitiator.java index d515e8d090..e74255c714 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceInitiator.java @@ -27,7 +27,7 @@ import java.util.Map; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.spi.ServiceInitiator; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; /** @@ -44,7 +44,7 @@ public class ClassLoaderServiceInitiator implements ServiceInitiator serviceInitiators; private ServicesInitializer initializer; @@ -56,7 +56,7 @@ public class ServicesRegistryImpl implements ServicesRegistry { // iterate it in reverse order which is only available through ListIterator private List serviceList = new ArrayList(); - public ServicesRegistryImpl(List serviceInitiators) { + public ServiceRegistryImpl(List serviceInitiators) { this.serviceInitiators = Collections.unmodifiableList( serviceInitiators ); } diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/ServicesInitializer.java b/hibernate-core/src/main/java/org/hibernate/service/internal/ServicesInitializer.java index 975c8b4771..a430d5c97a 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/ServicesInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/ServicesInitializer.java @@ -38,7 +38,7 @@ import org.hibernate.service.spi.Manageable; import org.hibernate.service.spi.Service; import org.hibernate.service.spi.ServiceException; import org.hibernate.service.spi.ServiceInitiator; -import org.hibernate.service.spi.ServicesRegistryAwareService; +import org.hibernate.service.spi.ServiceRegistryAwareService; import org.hibernate.service.spi.Startable; import org.hibernate.service.spi.UnknownServiceException; @@ -50,12 +50,12 @@ import org.hibernate.service.spi.UnknownServiceException; public class ServicesInitializer { private static final Logger log = LoggerFactory.getLogger( ServicesInitializer.class ); - private final ServicesRegistryImpl servicesRegistry; + private final ServiceRegistryImpl servicesRegistry; private final Map serviceInitiatorMap; private final Map configurationValues; public ServicesInitializer( - ServicesRegistryImpl servicesRegistry, + ServiceRegistryImpl servicesRegistry, List serviceInitiators, Map configurationValues) { this.servicesRegistry = servicesRegistry; @@ -131,8 +131,8 @@ public class ServicesInitializer { ( (Configurable) service ).configure( configurationValues ); } - if ( ServicesRegistryAwareService.class.isInstance( service ) ) { - ( (ServicesRegistryAwareService) service ).injectServices( servicesRegistry ); + if ( ServiceRegistryAwareService.class.isInstance( service ) ) { + ( (ServiceRegistryAwareService) service ).injectServices( servicesRegistry ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java index 3a33891dac..edb89aaeaa 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java @@ -40,8 +40,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.beans.BeanInfoHelper; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.service.spi.ServiceInitiator; +import org.hibernate.service.spi.ServiceRegistry; /** * Instantiates and configures an appropriate {@link ConnectionProvider}. @@ -103,7 +103,7 @@ public class ConnectionProviderInitiator implements ServiceInitiator /** * {@inheritDoc} */ - public DialectFactory initiateService(Map configVales, ServicesRegistry registry) { + public DialectFactory initiateService(Map configVales, ServiceRegistry registry) { return new DialectFactoryImpl(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverInitiator.java index ee04d360db..bb5801f773 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverInitiator.java @@ -26,8 +26,8 @@ package org.hibernate.service.jdbc.dialect.internal; import java.util.Map; import org.hibernate.service.jdbc.dialect.spi.DialectResolver; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.service.spi.ServiceInitiator; +import org.hibernate.service.spi.ServiceRegistry; /** * Standard initiator for the standard {@link DialectResolver} service @@ -47,7 +47,7 @@ public class DialectResolverInitiator implements ServiceInitiator { } @Override - public JmxService initiateService(Map configValues, ServicesRegistry registry) { + public JmxService initiateService(Map configValues, ServiceRegistry registry) { return ConfigurationHelper.getBoolean( JMX_ENABLED, configValues, false ) ? new JmxServiceImpl( configValues ) : DisabledJmxServiceImpl.INSTANCE; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java index a338a7fafa..b34e6808dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java @@ -27,7 +27,7 @@ import java.util.Map; import org.hibernate.service.jndi.spi.JndiService; import org.hibernate.service.spi.ServiceInitiator; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; /** * Standard initiator for the standard {@link JndiService} service @@ -43,7 +43,7 @@ public class JndiServiceInitiator implements ServiceInitiator { } @Override - public JndiService initiateService(Map configurationValues, ServicesRegistry registry) { + public JndiService initiateService(Map configurationValues, ServiceRegistry registry) { return new JndiServiceImpl( configurationValues ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java index a26c27fbea..5e548dbee6 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java @@ -28,8 +28,8 @@ import java.util.Map; import org.hibernate.HibernateException; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.jta.platform.spi.JtaPlatform; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.service.spi.ServiceInitiator; +import org.hibernate.service.spi.ServiceRegistry; /** * Standard initiator for the standard {@link org.hibernate.service.jta.platform.spi.JtaPlatform} @@ -51,7 +51,7 @@ public class JtaPlatformInitiator implements ServiceInitiator { /** * {@inheritDoc} */ - public JtaPlatform initiateService(Map configVales, ServicesRegistry registry) { + public JtaPlatform initiateService(Map configVales, ServiceRegistry registry) { final Object platform = configVales.get( JTA_PLATFORM ); if ( JtaPlatform.class.isInstance( platform ) ) { return (JtaPlatform) platform; diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java index 52e768f98b..39ca93d9d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java @@ -46,5 +46,5 @@ public interface ServiceInitiator { * * @return The initiated service. */ - public T initiateService(Map configurationValues, ServicesRegistry registry); + public T initiateService(Map configurationValues, ServiceRegistry registry); } diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistry.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistry.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistry.java rename to hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistry.java index f46017634b..e2046b02a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistry.java @@ -28,7 +28,7 @@ package org.hibernate.service.spi; * * @author Steve Ebersole */ -public interface ServicesRegistry { +public interface ServiceRegistry { /** * Retrieve a service by role. * diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistryAwareService.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java similarity index 79% rename from hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistryAwareService.java rename to hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java index 50ea752cc9..67763b52a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistryAwareService.java +++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java @@ -24,15 +24,15 @@ package org.hibernate.service.spi; /** - * Allows services to be injected with the {@link ServicesRegistry} during configuration phase. + * Allows services to be injected with the {@link ServiceRegistry} during configuration phase. * * @author Steve Ebersole */ -public interface ServicesRegistryAwareService { +public interface ServiceRegistryAwareService { /** - * Callback to inject the regsitry. + * Callback to inject the registry. * - * @param servicesRegistry The registry + * @param serviceRegistry The registry */ - public void injectServices(ServicesRegistry servicesRegistry); + public void injectServices(ServiceRegistry serviceRegistry); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java index ada581417b..36ec52ac6a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java @@ -27,9 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.hibernate.service.internal.ServiceRegistryImpl; import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.cfg.Environment; @@ -41,7 +39,6 @@ import org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator; import org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator; import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.service.internal.ServicesRegistryImpl; import org.hibernate.service.spi.ServiceInitiator; import org.hibernate.test.common.ConnectionProviderBuilder; @@ -51,7 +48,7 @@ import org.hibernate.test.common.ConnectionProviderBuilder; * @author Steve Ebersole */ public class ServiceBootstrappingTest extends UnitTestCase { - private ServicesRegistryImpl servicesRegistry; + private ServiceRegistryImpl servicesRegistry; public ServiceBootstrappingTest(String string) { super( string ); @@ -65,7 +62,7 @@ public class ServiceBootstrappingTest extends UnitTestCase { serviceInitiators.add( DialectFactoryInitiator.INSTANCE ); serviceInitiators.add( JdbcServicesInitiator.INSTANCE ); - servicesRegistry = new ServicesRegistryImpl( serviceInitiators ); + servicesRegistry = new ServiceRegistryImpl( serviceInitiators ); } protected void tearDown() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java index 8aa830440d..148cc2aed8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java +++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java @@ -25,7 +25,7 @@ package org.hibernate.test.cfg.internal; import org.hibernate.cfg.internal.ServicesRegistryBootstrap; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.service.internal.ServicesRegistryImpl; +import org.hibernate.service.internal.ServiceRegistryImpl; import org.hibernate.test.common.ConnectionProviderBuilder; import org.hibernate.testing.junit.UnitTestCase; @@ -41,7 +41,7 @@ public class TestServicesRegistryBootstrapping extends UnitTestCase { } public void testBasicBootstrapping() { - ServicesRegistryImpl servicesRegistry = new ServicesRegistryBootstrap().initiateServicesRegistry( + ServiceRegistryImpl servicesRegistry = new ServicesRegistryBootstrap().initiateServicesRegistry( ConnectionProviderBuilder.getConnectionProviderProperties() ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java b/hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java index c9850fc169..b631bff2f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java @@ -23,7 +23,6 @@ */ package org.hibernate.test.common; -import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -33,15 +32,14 @@ import org.hibernate.engine.jdbc.internal.JdbcServicesImpl; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.classloading.spi.ClassLoaderService; -import org.hibernate.service.internal.ServicesRegistryImpl; -import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.internal.ServiceRegistryImpl; +import org.hibernate.service.spi.ServiceRegistry; /** * @author Gail Badner */ public class ServiceRegistryHolder { - private final ServicesRegistryImpl serviceRegistry; + private final ServiceRegistryImpl serviceRegistry; private final Properties properties; public ServiceRegistryHolder(Map props) { @@ -57,7 +55,7 @@ public class ServiceRegistryHolder { return properties; } - public ServicesRegistry getServiceRegistry() { + public ServiceRegistry getServiceRegistry() { return serviceRegistry; } diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java index 0726cc837a..c43034a0d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java @@ -38,7 +38,7 @@ import junit.framework.TestSuite; import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.test.common.ServiceRegistryHolder; /** @@ -96,7 +96,7 @@ public abstract class UnitTestCase extends junit.framework.TestCase { } } - protected ServicesRegistry getServiceRegistry() { + protected ServiceRegistry getServiceRegistry() { if ( serviceRegistryHolder == null ) { serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java index 32992cade3..0d63c4dc9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java @@ -40,7 +40,7 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Collection; import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.test.common.ServiceRegistryHolder; /** @@ -80,7 +80,7 @@ public class ExecutionEnvironment { return configuration; } - public ServicesRegistry getServiceRegistry() { + public ServiceRegistry getServiceRegistry() { return serviceRegistryHolder.getServiceRegistry(); } diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java index 7e2fe5be78..e086106cc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java @@ -42,7 +42,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.jdbc.Work; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.test.common.ServiceRegistryHolder; import org.hibernate.testing.junit.DialectChecks; import org.hibernate.testing.junit.FailureExpected; @@ -152,7 +152,7 @@ public abstract class HibernateTestCase extends TestCase { handleUnclosedResources(); } - protected ServicesRegistry getServiceRegistry() { + protected ServiceRegistry getServiceRegistry() { if ( serviceRegistryHolder == null ) { serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); } diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java index ca53cc4ec3..887a1e11bb 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java @@ -73,7 +73,6 @@ import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.NamingStrategy; -import org.hibernate.cfg.Settings; import org.hibernate.cfg.annotations.reflection.XMLContext; import org.hibernate.ejb.connection.InjectedDataSourceConnectionProvider; import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer; @@ -94,8 +93,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.secure.JACCConfiguration; import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.transaction.JDBCTransactionFactory; import org.hibernate.util.CollectionHelper; import org.hibernate.util.ReflectHelper; @@ -1505,7 +1503,7 @@ public class Ejb3Configuration implements Serializable, Referenceable { return cfg.getEventListeners(); } - SessionFactory buildSessionFactory(ServicesRegistry serviceRegistry) throws HibernateException { + SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throws HibernateException { return cfg.buildSessionFactory( serviceRegistry ); } diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java index ee1e4b6a71..7558708a58 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import java.util.Set; import java.util.Iterator; import java.io.Serializable; import javax.persistence.EntityManager; @@ -39,7 +38,6 @@ import javax.persistence.spi.LoadState; import org.hibernate.SessionFactory; import org.hibernate.Hibernate; -import org.hibernate.HibernateException; import org.hibernate.EntityMode; import org.hibernate.cfg.internal.ServicesRegistryBootstrap; import org.hibernate.metadata.ClassMetadata; @@ -49,8 +47,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.metamodel.MetamodelImpl; import org.hibernate.ejb.util.PersistenceUtilHelper; -import org.hibernate.service.internal.ServicesRegistryImpl; -import org.hibernate.service.spi.ServicesRegistry; +import org.hibernate.service.internal.ServiceRegistryImpl; /** * Actual Hiberate implementation of {@link javax.persistence.EntityManagerFactory}. @@ -60,7 +57,7 @@ import org.hibernate.service.spi.ServicesRegistry; * @author Steve Ebersole */ public class EntityManagerFactoryImpl implements HibernateEntityManagerFactory { - private final transient ServicesRegistryImpl serviceRegistry; + private final transient ServiceRegistryImpl serviceRegistry; private final SessionFactory sessionFactory; private final PersistenceUnitTransactionType transactionType; private final boolean discardOnClose; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java index 84ffd1264b..acf3f93eee 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java @@ -27,10 +27,6 @@ import java.util.Set; import org.hibernate.cache.RegionFactory; import org.hibernate.cache.infinispan.util.CacheHelper; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.cache.infinispan.util.CacheTestSupport; import org.infinispan.Cache; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java index 42a9c5c43b..1db018c176 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java @@ -37,8 +37,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.ServicesRegistry; /** * Utilities for cache testing.