Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6683 - Consolidate (consistency) building of service registries

This commit is contained in:
Steve Ebersole 2011-09-27 11:49:17 -05:00
parent 8c691d5fcd
commit f4fa176255
56 changed files with 330 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
documentation/src/main/docbook/devguide/en-US/Services.xml
View File

@ -875,6 +875,11 @@
is the root registry (no parent) in normal use.
</para>
<para>
Instances of boot-strap registries are built using the
<classname>org.hibernate.service.BootstrapServiceRegistryBuilder</classname> builder.
</para>
<section id="services-registry-bootstrap-services">
<title>Boot-strap registry services</title>
<section id="services-ClassLoaderService">

4
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -132,7 +132,7 @@ import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.internal.JACCConfiguration;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.tool.hbm2ddl.IndexMetadata;
import org.hibernate.tool.hbm2ddl.TableMetadata;
@ -1754,7 +1754,7 @@ public class Configuration implements Serializable {
@Override
public void sessionFactoryClosed(SessionFactory factory) {
( (BasicServiceRegistryImpl) serviceRegistry ).destroy();
( (StandardServiceRegistryImpl) serviceRegistry ).destroy();
}
}
);

10
hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
View File

@ -50,7 +50,7 @@ import org.hibernate.metamodel.source.MappingException;
import org.hibernate.metamodel.source.MappingNotFoundException;
import org.hibernate.metamodel.source.internal.JaxbHelper;
import org.hibernate.metamodel.source.internal.MetadataBuilderImpl;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.classloading.spi.ClassLoaderService;
/**
@ -65,17 +65,17 @@ public class MetadataSources {
private final JaxbHelper jaxbHelper;
private final BasicServiceRegistry serviceRegistry;
private final ServiceRegistry serviceRegistry;
private final EntityResolver entityResolver;
private final NamingStrategy namingStrategy;
private final MetadataBuilderImpl metadataBuilder;
public MetadataSources(BasicServiceRegistry serviceRegistry) {
public MetadataSources(ServiceRegistry serviceRegistry) {
this( serviceRegistry, EJB3DTDEntityResolver.INSTANCE, EJB3NamingStrategy.INSTANCE );
}
public MetadataSources(BasicServiceRegistry serviceRegistry, EntityResolver entityResolver, NamingStrategy namingStrategy) {
public MetadataSources(ServiceRegistry serviceRegistry, EntityResolver entityResolver, NamingStrategy namingStrategy) {
this.serviceRegistry = serviceRegistry;
this.entityResolver = entityResolver;
this.namingStrategy = namingStrategy;
@ -96,7 +96,7 @@ public class MetadataSources {
return annotatedClasses;
}
public BasicServiceRegistry getServiceRegistry() {
public ServiceRegistry getServiceRegistry() {
return serviceRegistry;
}

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataImplementor.java
View File

@ -35,14 +35,14 @@ import org.hibernate.metamodel.binding.IdGenerator;
import org.hibernate.metamodel.binding.PluralAttributeBinding;
import org.hibernate.metamodel.binding.TypeDef;
import org.hibernate.metamodel.relational.Database;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.TypeResolver;
/**
* @author Steve Ebersole
*/
public interface MetadataImplementor extends Metadata, BindingContext, Mapping {
public BasicServiceRegistry getServiceRegistry();
public ServiceRegistry getServiceRegistry();
public Database getDatabase();

4
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
View File

@ -33,7 +33,7 @@ import org.hibernate.metamodel.Metadata;
import org.hibernate.metamodel.MetadataBuilder;
import org.hibernate.metamodel.MetadataSourceProcessingOrder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.config.spi.ConfigurationService;
/**
@ -93,7 +93,7 @@ public class MetadataBuilderImpl implements MetadataBuilder {
private String defaultSchemaName;
private String defaultCatalogName;
public OptionsImpl(BasicServiceRegistry serviceRegistry) {
public OptionsImpl(ServiceRegistry serviceRegistry) {
ConfigurationService configService = serviceRegistry.getService( ConfigurationService.class );
// cache access type

22
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
View File

@ -49,23 +49,23 @@ import org.hibernate.internal.util.Value;
import org.hibernate.metamodel.MetadataSourceProcessingOrder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.SessionFactoryBuilder;
import org.hibernate.metamodel.binding.AttributeBinding;
import org.hibernate.metamodel.binding.EntityBinding;
import org.hibernate.metamodel.binding.FetchProfile;
import org.hibernate.metamodel.binding.IdGenerator;
import org.hibernate.metamodel.binding.PluralAttributeBinding;
import org.hibernate.metamodel.binding.TypeDef;
import org.hibernate.metamodel.domain.BasicType;
import org.hibernate.metamodel.domain.Type;
import org.hibernate.metamodel.relational.Database;
import org.hibernate.metamodel.source.MappingDefaults;
import org.hibernate.metamodel.source.MetaAttributeContext;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.metamodel.source.MetadataSourceProcessor;
import org.hibernate.metamodel.source.annotations.AnnotationMetadataSourceProcessorImpl;
import org.hibernate.metamodel.source.hbm.HbmMetadataSourceProcessorImpl;
import org.hibernate.metamodel.binding.AttributeBinding;
import org.hibernate.metamodel.binding.EntityBinding;
import org.hibernate.metamodel.binding.FetchProfile;
import org.hibernate.metamodel.binding.IdGenerator;
import org.hibernate.metamodel.binding.TypeDef;
import org.hibernate.metamodel.domain.BasicType;
import org.hibernate.metamodel.domain.Type;
import org.hibernate.metamodel.relational.Database;
import org.hibernate.persister.spi.PersisterClassResolver;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.type.TypeResolver;
@ -83,7 +83,7 @@ public class MetadataImpl implements MetadataImplementor, Serializable {
MetadataImpl.class.getName()
);
private final BasicServiceRegistry serviceRegistry;
private final ServiceRegistry serviceRegistry;
private final Options options;
private final Value<ClassLoaderService> classLoaderService;
@ -341,7 +341,7 @@ public class MetadataImpl implements MetadataImplementor, Serializable {
}
@Override
public BasicServiceRegistry getServiceRegistry() {
public ServiceRegistry getServiceRegistry() {
return serviceRegistry;
}

30
hibernate-core/src/main/java/org/hibernate/service/BasicServiceRegistry.java
View File

@ -1,30 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service;
/**
* @author Steve Ebersole
*/
public interface BasicServiceRegistry extends ServiceRegistry {
}

127
hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java Normal file
View File

@ -0,0 +1,127 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service;
import java.util.LinkedHashSet;
import org.hibernate.integrator.internal.IntegratorServiceImpl;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
/**
* Builder for bootstrap {@link ServiceRegistry} instances.
*
* @author Steve Ebersole
*
* @see BootstrapServiceRegistryImpl
* @see ServiceRegistryBuilder#ServiceRegistryBuilder(BootstrapServiceRegistryImpl)
*/
public class BootstrapServiceRegistryBuilder {
private final LinkedHashSet<Integrator> providedIntegrators = new LinkedHashSet<Integrator>();
private ClassLoader applicationClassLoader;
private ClassLoader resourcesClassLoader;
private ClassLoader hibernateClassLoader;
private ClassLoader environmentClassLoader;
/**
* Add an {@link Integrator} to be applied to the bootstrap registry.
*
* @param integrator The integrator to add.
* @return {@code this}, for method chaining
*/
public BootstrapServiceRegistryBuilder with(Integrator integrator) {
providedIntegrators.add( integrator );
return this;
}
/**
* Applies the specified {@link ClassLoader} as the application class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withApplicationClassLoader(ClassLoader classLoader) {
this.applicationClassLoader = classLoader;
return this;
}
/**
* Applies the specified {@link ClassLoader} as the resource class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withResourceClassLoader(ClassLoader classLoader) {
this.resourcesClassLoader = classLoader;
return this;
}
/**
* Applies the specified {@link ClassLoader} as the Hibernate class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withHibernateClassLoader(ClassLoader classLoader) {
this.hibernateClassLoader = classLoader;
return this;
}
/**
* Applies the specified {@link ClassLoader} as the environment (or system) class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withEnvironmentClassLoader(ClassLoader classLoader) {
this.environmentClassLoader = classLoader;
return this;
}
/**
* Build the bootstrap registry.
*
* @return The built bootstrap registry
*/
public ServiceRegistry build() {
final ClassLoaderServiceImpl classLoaderService = new ClassLoaderServiceImpl(
applicationClassLoader,
resourcesClassLoader,
hibernateClassLoader,
environmentClassLoader
);
final IntegratorServiceImpl integratorService = new IntegratorServiceImpl(
providedIntegrators,
classLoaderService
);
return new BootstrapServiceRegistryImpl( classLoaderService, integratorService );
}
}

2
hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
View File

@ -24,7 +24,7 @@
package org.hibernate.service;
/**
* The registry of {@link Service services}.
* A registry of {@link Service services}.
*
* @author Steve Ebersole
*/

15
hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
View File

@ -44,16 +44,19 @@ import org.hibernate.internal.util.config.ConfigurationException;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.internal.jaxb.cfg.JaxbHibernateConfiguration;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.internal.JaxbProcessor;
import org.hibernate.service.internal.ProvidedService;
import org.hibernate.service.spi.BasicServiceInitiator;
/**
* Builder for basic service registry instances.
* Builder for standard {@link ServiceRegistry} instances.
*
* @author Steve Ebersole
*
* @see StandardServiceRegistryImpl
* @see BootstrapServiceRegistryBuilder
*/
public class ServiceRegistryBuilder {
private static final Logger log = Logger.getLogger( ServiceRegistryBuilder.class );
@ -235,7 +238,7 @@ public class ServiceRegistryBuilder {
*
* @return The built service registry
*/
public BasicServiceRegistry buildServiceRegistry() {
public ServiceRegistry buildServiceRegistry() {
Map<?,?> settingsCopy = new HashMap();
settingsCopy.putAll( settings );
Environment.verifyProperties( settingsCopy );
@ -247,7 +250,7 @@ public class ServiceRegistryBuilder {
}
}
return new BasicServiceRegistryImpl( bootstrapServiceRegistry, initiators, providedServices, settingsCopy );
return new StandardServiceRegistryImpl( bootstrapServiceRegistry, initiators, providedServices, settingsCopy );
}
/**
@ -255,7 +258,7 @@ public class ServiceRegistryBuilder {
*
* @param serviceRegistry The registry to be closed.
*/
public static void destroy(BasicServiceRegistry serviceRegistry) {
( (BasicServiceRegistryImpl) serviceRegistry ).destroy();
public static void destroy(ServiceRegistry serviceRegistry) {
( (StandardServiceRegistryImpl) serviceRegistry ).destroy();
}
}

5
hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
View File

@ -24,6 +24,7 @@
package org.hibernate.service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.hibernate.cache.internal.RegionFactoryInitiator;
@ -45,6 +46,8 @@ import org.hibernate.service.jta.platform.internal.JtaPlatformInitiator;
import org.hibernate.service.spi.BasicServiceInitiator;
/**
* Central definition of the standard set of service initiators defined by Hibernate.
*
* @author Steve Ebersole
*/
public class StandardServiceInitiators {
@ -77,6 +80,6 @@ public class StandardServiceInitiators {
serviceInitiators.add( RegionFactoryInitiator.INSTANCE );
return serviceInitiators;
return Collections.unmodifiableList( serviceInitiators );
}
}

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

@ -59,6 +59,7 @@ public abstract class AbstractServiceRegistryImpl implements ServiceRegistryImpl
// iterate it in reverse order which is only available through ListIterator
private List<Service> serviceList = new ArrayList<Service>();
@SuppressWarnings( {"UnusedDeclaration"})
protected AbstractServiceRegistryImpl() {
this( null );
}

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

@ -28,6 +28,7 @@ import java.util.LinkedHashSet;
import org.hibernate.integrator.internal.IntegratorServiceImpl;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
@ -51,8 +52,8 @@ public class BootstrapServiceRegistryImpl implements ServiceRegistryImplementor,
private final ServiceBinding<ClassLoaderService> classLoaderServiceBinding;
private final ServiceBinding<IntegratorService> integratorServiceBinding;
public static Builder builder() {
return new Builder();
public static BootstrapServiceRegistryBuilder builder() {
return new BootstrapServiceRegistryBuilder();
}
public BootstrapServiceRegistryImpl() {
@ -118,52 +119,4 @@ public class BootstrapServiceRegistryImpl implements ServiceRegistryImplementor,
throw new ServiceException( "Boot-strap registry should only contain directly built services" );
}
public static class Builder {
private final LinkedHashSet<Integrator> providedIntegrators = new LinkedHashSet<Integrator>();
private ClassLoader applicationClassLoader;
private ClassLoader resourcesClassLoader;
private ClassLoader hibernateClassLoader;
private ClassLoader environmentClassLoader;
public Builder with(Integrator integrator) {
providedIntegrators.add( integrator );
return this;
}
public Builder withApplicationClassLoader(ClassLoader classLoader) {
this.applicationClassLoader = classLoader;
return this;
}
public Builder withResourceClassLoader(ClassLoader classLoader) {
this.resourcesClassLoader = classLoader;
return this;
}
public Builder withHibernateClassLoader(ClassLoader classLoader) {
this.hibernateClassLoader = classLoader;
return this;
}
public Builder withEnvironmentClassLoader(ClassLoader classLoader) {
this.environmentClassLoader = classLoader;
return this;
}
public BootstrapServiceRegistryImpl build() {
final ClassLoaderServiceImpl classLoaderService = new ClassLoaderServiceImpl(
applicationClassLoader,
resourcesClassLoader,
hibernateClassLoader,
environmentClassLoader
);
final IntegratorServiceImpl integratorService = new IntegratorServiceImpl(
providedIntegrators,
classLoaderService
);
return new BootstrapServiceRegistryImpl( classLoaderService, integratorService );
}
}
}

38
hibernate-core/src/main/java/org/hibernate/service/internal/ServiceProxy.java
View File

@ -1,38 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.internal;
import org.hibernate.service.Service;
/**
* Marker interface for a service proxy which allows mixed-in ability to unproxy.
*
* @author Steve Ebersole
*/
public interface ServiceProxy extends Service {
/**
* Get the target service instance represented by this proxy.
*/
public <T extends Service> T getTargetInstance();
}

2
hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
View File

@ -31,7 +31,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceRegistryFactory;
/**
* Acts as a {@link Service} in the {@link BasicServiceRegistryImpl} whose function is as a factory for
* Acts as a {@link Service} in the {@link StandardServiceRegistryImpl} whose function is as a factory for
* {@link SessionFactoryServiceRegistryImpl} implementations.
*
* @author Steve Ebersole

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

@ -27,7 +27,6 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.Service;
import org.hibernate.service.StandardSessionFactoryServiceInitiators;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

8
hibernate-core/src/main/java/org/hibernate/service/internal/BasicServiceRegistryImpl.java → hibernate-core/src/main/java/org/hibernate/service/internal/StandardServiceRegistryImpl.java
View File

@ -26,7 +26,7 @@ package org.hibernate.service.internal;
import java.util.List;
import java.util.Map;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.Service;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.spi.Configurable;
@ -35,15 +35,15 @@ import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* Standard Hibernate implementation of the service registry.
* Hibernate implementation of the standard service registry.
*
* @author Steve Ebersole
*/
public class BasicServiceRegistryImpl extends AbstractServiceRegistryImpl implements BasicServiceRegistry {
public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl implements ServiceRegistry {
private final Map configurationValues;
@SuppressWarnings( {"unchecked"})
public BasicServiceRegistryImpl(
public StandardServiceRegistryImpl(
ServiceRegistryImplementor bootstrapServiceRegistry,
List<BasicServiceInitiator> serviceInitiators,
List<ProvidedService> providedServices,

8
hibernate-core/src/main/java/org/hibernate/service/StandardSessionFactoryServiceInitiators.java → hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java
View File

@ -21,9 +21,10 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service;
package org.hibernate.service.internal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.hibernate.event.service.internal.EventListenerServiceInitiator;
@ -31,6 +32,9 @@ import org.hibernate.service.spi.SessionFactoryServiceInitiator;
import org.hibernate.stat.internal.StatisticsInitiator;
/**
* Central definition of the standard set of initiators defined by Hibernate for the
* {@link org.hibernate.service.spi.SessionFactoryServiceRegistry}
*
* @author Steve Ebersole
*/
public class StandardSessionFactoryServiceInitiators {
@ -42,6 +46,6 @@ public class StandardSessionFactoryServiceInitiators {
serviceInitiators.add( EventListenerServiceInitiator.INSTANCE );
serviceInitiators.add( StatisticsInitiator.INSTANCE );
return serviceInitiators;
return Collections.unmodifiableList( serviceInitiators );
}
}

2
hibernate-core/src/main/java/org/hibernate/service/spi/BasicServiceInitiator.java
View File

@ -28,7 +28,7 @@ import java.util.Map;
import org.hibernate.service.Service;
/**
* Responsible for initiating services.
* Contract for an initiator of services that target the standard {@link org.hibernate.service.ServiceRegistry}
*
* @author Steve Ebersole
*/

1
hibernate-core/src/main/java/org/hibernate/service/spi/Manageable.java
View File

@ -23,7 +23,6 @@
*/
package org.hibernate.service.spi;
/**
* Optional {@link org.hibernate.service.Service} contract for services which can be managed in JMX
*

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

@ -29,6 +29,7 @@ import org.hibernate.service.Service;
/**
* Models a binding for a particular service
*
* @author Steve Ebersole
*/
public final class ServiceBinding<R extends Service> {

2
hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java
View File

@ -26,6 +26,8 @@ package org.hibernate.service.spi;
import org.hibernate.service.Service;
/**
* Base contract for an initiator of a service.
*
* @author Steve Ebersole
*/
public interface ServiceInitiator<R extends Service> {

14
hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java
View File

@ -27,9 +27,23 @@ import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
/**
* Additional integration contracts for a service registry.
*
* @author Steve Ebersole
*/
public interface ServiceRegistryImplementor extends ServiceRegistry {
/**
* Locate the binding for the given role. Should, generally speaking, look into parent registry if one.
*
* @param serviceRole The service role for which to locate a binding.
* @param <R> generic return type.
*
* @return The located binding; may be {@code null}
*/
public <R extends Service> ServiceBinding<R> locateServiceBinding(Class<R> serviceRole);
/**
* Release resources
*/
public void destroy();
}

3
hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceInitiator.java
View File

@ -29,6 +29,9 @@ import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.Service;
/**
* Contract for an initiator of services that target the specialized service registry
* {@link SessionFactoryServiceRegistry}
*
* @author Steve Ebersole
*/
public interface SessionFactoryServiceInitiator<R extends Service> extends ServiceInitiator<R>{

4
hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistry.java
View File

@ -24,8 +24,8 @@
package org.hibernate.service.spi;
/**
* Acts as a {@link org.hibernate.service.Service} in the {@link org.hibernate.service.internal.BasicServiceRegistryImpl} whose function is as a factory for
* {@link org.hibernate.service.internal.SessionFactoryServiceRegistryImpl} implementations.
* Specialized {@link org.hibernate.service.ServiceRegistry} implementation that holds services which need access
* to the {@link org.hibernate.SessionFactory} during initialization.
*
* @author Steve Ebersole
*/

5
hibernate-core/src/main/java/org/hibernate/service/spi/SessionFactoryServiceRegistryFactory.java
View File

@ -30,8 +30,9 @@ import org.hibernate.service.Service;
import org.hibernate.service.internal.SessionFactoryServiceRegistryImpl;
/**
* Contract for builder of {@link SessionFactoryServiceRegistry} instances. Defined as a service to
* "sit inside" the {@link org.hibernate.service.BasicServiceRegistry}.
* Contract for builder of {@link SessionFactoryServiceRegistry} instances.
* <p/>
* Is itself a service within the standard service registry.
*
* @author Steve Ebersole
*/

2
hibernate-core/src/main/java/org/hibernate/service/spi/Startable.java
View File

@ -25,7 +25,7 @@ package org.hibernate.service.spi;
/**
* Lifecyle contract for services which wish to be notified when it is time to start.
* Lifecycle contract for services which wish to be notified when it is time to start.
*
* @author Steve Ebersole
*/

3
hibernate-core/src/main/java/org/hibernate/service/spi/Stoppable.java
View File

@ -23,9 +23,8 @@
*/
package org.hibernate.service.spi;
/**
* Lifecyle contract for services which wish to be notified when it is time to stop.
* Lifecycle contract for services which wish to be notified when it is time to stop.
*
* @author Steve Ebersole
*/

4
hibernate-core/src/main/java/org/hibernate/service/spi/Wrapped.java
View File

@ -24,6 +24,10 @@
package org.hibernate.service.spi;
/**
* Optional contract for services that wrap stuff that to which it is useful to have access. For example, a service
* that maintains a {@link javax.sql.DataSource} might want to expose access to the {@link javax.sql.DataSource} or
* its {@link java.sql.Connection} instances.
*
* @author Steve Ebersole
*/
public interface Wrapped {

8
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
View File

@ -32,7 +32,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
/**
@ -43,7 +43,7 @@ import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
*/
class ManagedProviderConnectionHelper implements ConnectionHelper {
private Properties cfgProperties;
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private Connection connection;
public ManagedProviderConnectionHelper(Properties cfgProperties) {
@ -59,10 +59,10 @@ class ManagedProviderConnectionHelper implements ConnectionHelper {
}
}
private static BasicServiceRegistryImpl createServiceRegistry(Properties properties) {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
return (BasicServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public Connection getConnection() throws SQLException {

8
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
View File

@ -60,7 +60,7 @@ import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
/**
@ -490,10 +490,10 @@ public class SchemaExport {
}
private static BasicServiceRegistryImpl createServiceRegistry(Properties properties) {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
return (BasicServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public static void main(String[] args) {
@ -576,7 +576,7 @@ public class SchemaExport {
cfg.setProperty( Environment.HBM2DDL_IMPORT_FILES, importFile );
}
BasicServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() );
StandardServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() );
try {
SchemaExport se = new SchemaExport( serviceRegistry, cfg )
.setHaltOnError( halt )

8
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
View File

@ -51,7 +51,7 @@ import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
/**
* A commandline tool to update a database schema. May also be called from inside an application.
@ -107,10 +107,10 @@ public class SchemaUpdate {
this.formatter = ( sqlStatementLogger.isFormat() ? FormatStyle.DDL : FormatStyle.NONE ).getFormatter();
}
private static BasicServiceRegistryImpl createServiceRegistry(Properties properties) {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
return (BasicServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public static void main(String[] args) {
@ -155,7 +155,7 @@ public class SchemaUpdate {
cfg.setProperties( props );
}
BasicServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() );
StandardServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() );
try {
new SchemaUpdate( serviceRegistry, cfg ).execute( script, doUpdate );
}

8
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
View File

@ -41,7 +41,7 @@ import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
/**
* A commandline tool to update a database schema. May also be called from
@ -76,10 +76,10 @@ public class SchemaValidator {
this.connectionHelper = new SuppliedConnectionProviderConnectionHelper( jdbcServices.getConnectionProvider() );
}
private static BasicServiceRegistryImpl createServiceRegistry(Properties properties) {
private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
return (BasicServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings( properties ).buildServiceRegistry();
}
public static void main(String[] args) {
@ -115,7 +115,7 @@ public class SchemaValidator {
cfg.setProperties( props );
}
BasicServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() );
StandardServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() );
try {
new SchemaValidator( serviceRegistry, cfg ).validate();
}

4
hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
View File

@ -24,7 +24,7 @@ import org.hibernate.MappingException;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import org.hibernate.persister.spi.PersisterClassResolver;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.junit.Test;
@ -42,7 +42,7 @@ public class PersisterClassProviderTest extends BaseUnitTestCase {
Configuration cfg = new Configuration();
cfg.addAnnotatedClass( Gate.class );
BasicServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
ServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
.applySettings( cfg.getProperties() )
.buildServiceRegistry();
//no exception as the GoofyPersisterClassProvider is not set

4
hibernate-core/src/matrix/java/org/hibernate/test/events/CallbackTest.java
View File

@ -36,7 +36,7 @@ import org.hibernate.event.spi.DeleteEventListener;
import org.hibernate.event.spi.EventType;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.junit.Test;
@ -66,7 +66,7 @@ public class CallbackTest extends BaseCoreFunctionalTestCase {
}
@Override
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryImpl.Builder builder) {
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
super.prepareBootstrapRegistryBuilder( builder );
builder.with(
new Integrator() {

4
hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/ExtendsTest.java
View File

@ -3,7 +3,7 @@ package org.hibernate.test.extendshbm;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
@ -20,7 +20,7 @@ import static org.junit.Assert.fail;
* @author Gavin King
*/
public class ExtendsTest extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() {

4
hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
View File

@ -30,7 +30,7 @@ import org.hibernate.event.service.spi.EventListenerRegistry;
import org.hibernate.event.spi.EventType;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.junit.Test;
@ -50,7 +50,7 @@ public class TestCollectionInitializingDuringFlush extends BaseCoreFunctionalTes
}
@Override
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryImpl.Builder builder) {
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
super.prepareBootstrapRegistryBuilder( builder );
builder.with(
new Integrator() {

4
hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java
View File

@ -44,7 +44,7 @@ import org.hibernate.integrator.spi.Integrator;
import org.hibernate.internal.util.collections.IdentityMap;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -69,7 +69,7 @@ public abstract class AbstractJPATest extends BaseCoreFunctionalTestCase {
}
@Override
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryImpl.Builder builder) {
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
builder.with(
new Integrator() {

4
hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
View File

@ -35,7 +35,7 @@ import org.hibernate.event.spi.LoadEvent;
import org.hibernate.event.spi.LoadEventListener;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
import org.junit.Test;
@ -63,7 +63,7 @@ public class EagerKeyManyToOneTest extends BaseCoreFunctionalTestCase {
}
@Override
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryImpl.Builder builder) {
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
super.prepareBootstrapRegistryBuilder( builder );
builder.with(
new Integrator() {

26
hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
View File

@ -27,26 +27,26 @@ import java.sql.Types;
import java.util.Iterator;
import java.util.Set;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.metamodel.source.internal.MetadataImpl;
import org.hibernate.metamodel.domain.BasicType;
import org.hibernate.metamodel.domain.SingularAttribute;
import org.hibernate.metamodel.relational.Column;
import org.hibernate.metamodel.relational.Datatype;
import org.hibernate.metamodel.relational.SimpleValue;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.metamodel.source.internal.MetadataImpl;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.type.LongType;
import org.hibernate.type.StringType;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
@ -61,11 +61,11 @@ import static org.junit.Assert.assertTrue;
*/
public abstract class AbstractBasicBindingTests extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
}
@After
@ -73,7 +73,7 @@ public abstract class AbstractBasicBindingTests extends BaseUnitTestCase {
serviceRegistry.destroy();
}
protected BasicServiceRegistry basicServiceRegistry() {
protected ServiceRegistry basicServiceRegistry() {
return serviceRegistry;
}

6
hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
View File

@ -27,7 +27,7 @@ import org.hibernate.metamodel.MetadataSourceProcessingOrder;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.source.internal.MetadataImpl;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
@ -43,11 +43,11 @@ import static org.junit.Assert.assertSame;
* @author Steve Ebersole
*/
public class BasicCollectionBindingTests extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
}
@After

6
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java
View File

@ -40,7 +40,7 @@ import org.hibernate.metamodel.source.annotations.JandexHelper;
import org.hibernate.metamodel.source.internal.MetadataImpl;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.fail;
@ -52,13 +52,13 @@ import static org.junit.Assert.assertTrue;
*/
public class FetchProfileBinderTest extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private ClassLoaderService service;
private MetadataImpl meta;
@Before
public void setUp() {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
service = serviceRegistry.getService( ClassLoaderService.class );
meta = (MetadataImpl) new MetadataSources( serviceRegistry ).buildMetadata();
}

6
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java
View File

@ -40,7 +40,7 @@ import org.hibernate.metamodel.source.annotations.JandexHelper;
import org.hibernate.metamodel.source.internal.MetadataImpl;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertEquals;
@ -52,13 +52,13 @@ import static junit.framework.Assert.assertTrue;
*/
public class QueryBinderTest extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private ClassLoaderService service;
private MetadataImpl meta;
@Before
public void setUp() {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
service = serviceRegistry.getService( ClassLoaderService.class );
meta = (MetadataImpl) new MetadataSources( serviceRegistry ).buildMetadata();
}

6
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java
View File

@ -48,7 +48,7 @@ import org.hibernate.metamodel.source.annotations.JPADotNames;
import org.hibernate.metamodel.source.annotations.JandexHelper;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static junit.framework.Assert.assertTrue;
@ -62,12 +62,12 @@ import static org.junit.Assert.fail;
* @author Hardy Ferentschik
*/
public class JandexHelperTest extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private ClassLoaderService classLoaderService;
@Before
public void setUp() {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder().buildServiceRegistry();
classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
}

6
hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
View File

@ -42,7 +42,7 @@ import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.jdbc.Expectation;
import org.hibernate.jdbc.Expectations;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
@ -64,11 +64,11 @@ import static org.junit.Assert.assertTrue;
* @author Steve Ebersole
*/
public class BatchingTest extends BaseUnitTestCase implements BatchKey {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() throws Exception {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
}

10
hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
View File

@ -33,7 +33,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
import org.hibernate.service.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
@ -47,7 +47,7 @@ import org.hibernate.testing.junit4.BaseUnitTestCase;
public class ServiceBootstrappingTest extends BaseUnitTestCase {
@Test
public void testBasicBuild() {
BasicServiceRegistryImpl serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
@ -64,7 +64,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
Properties props = ConnectionProviderBuilder.getConnectionProviderProperties();
props.put( Environment.SHOW_SQL, "true" );
BasicServiceRegistryImpl serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( props )
.buildServiceRegistry();
@ -79,7 +79,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
@Test
public void testBuildWithServiceOverride() {
BasicServiceRegistryImpl serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
StandardServiceRegistryImpl serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
@ -90,7 +90,7 @@ public class ServiceBootstrappingTest extends BaseUnitTestCase {
Properties props = ConnectionProviderBuilder.getConnectionProviderProperties();
props.setProperty( Environment.DIALECT, H2Dialect.class.getName() );
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( props )
.addService( ConnectionProvider.class, new UserSuppliedConnectionProviderImpl() )
.buildServiceRegistry();

6
hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
View File

@ -34,7 +34,7 @@ import org.hibernate.engine.transaction.internal.TransactionCoordinatorImpl;
import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
@ -55,11 +55,11 @@ import static org.junit.Assert.fail;
* @author Steve Ebersole
*/
public class TestExpectedUsage extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
public void setUp() throws Exception {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( ConnectionProviderBuilder.getConnectionProviderProperties() )
.buildServiceRegistry();
}

28
hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
View File

@ -30,10 +30,6 @@ import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
import org.hibernate.engine.transaction.internal.TransactionCoordinatorImpl;
@ -41,15 +37,19 @@ import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.ServiceProxy;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
import org.hibernate.test.common.TransactionEnvironmentImpl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.hibernate.testing.env.ConnectionProviderBuilder;
import org.hibernate.testing.jta.TestingJtaBootstrap;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
import org.hibernate.test.common.TransactionEnvironmentImpl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -62,7 +62,7 @@ import static org.junit.Assert.fail;
* @author Steve Ebersole
*/
public class BasicDrivingTest extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
@SuppressWarnings( {"unchecked"})
@ -71,7 +71,7 @@ public class BasicDrivingTest extends BaseUnitTestCase {
configValues.putAll( ConnectionProviderBuilder.getConnectionProviderProperties() );
configValues.put( Environment.TRANSACTION_STRATEGY, JtaTransactionFactory.class.getName() );
TestingJtaBootstrap.prepare( configValues );
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( configValues )
.buildServiceRegistry();
}
@ -142,8 +142,7 @@ public class BasicDrivingTest extends BaseUnitTestCase {
}
catch ( SQLException sqle ) {
try {
JtaPlatform instance = ( (ServiceProxy) serviceRegistry.getService( JtaPlatform.class ) ).getTargetInstance();
instance.retrieveTransactionManager().rollback();
serviceRegistry.getService( JtaPlatform.class ).retrieveTransactionManager().rollback();
}
catch (Exception ignore) {
}
@ -151,8 +150,7 @@ public class BasicDrivingTest extends BaseUnitTestCase {
}
catch (Throwable reThrowable) {
try {
JtaPlatform instance = ( (ServiceProxy) serviceRegistry.getService( JtaPlatform.class ) ).getTargetInstance();
instance.retrieveTransactionManager().rollback();
serviceRegistry.getService( JtaPlatform.class ).retrieveTransactionManager().rollback();
}
catch (Exception ignore) {
}

6
hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
View File

@ -43,7 +43,7 @@ import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionContext;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.test.common.JournalingTransactionObserver;
import org.hibernate.test.common.TransactionContextImpl;
@ -62,7 +62,7 @@ import static org.junit.Assert.fail;
* @author Steve Ebersole
*/
public class ManagedDrivingTest extends BaseUnitTestCase {
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
@Before
@SuppressWarnings( {"unchecked"})
@ -71,7 +71,7 @@ public class ManagedDrivingTest extends BaseUnitTestCase {
TestingJtaBootstrap.prepare( configValues );
configValues.put( Environment.TRANSACTION_STRATEGY, CMTTransactionFactory.class.getName() );
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( configValues )
.buildServiceRegistry();
}

3
hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
View File

@ -102,6 +102,7 @@ import org.hibernate.mapping.AuxiliaryDatabaseObject;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.internal.JACCConfiguration;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl;
@ -886,7 +887,7 @@ public class Ejb3Configuration implements Serializable, Referenceable {
return buildEntityManagerFactory( BootstrapServiceRegistryImpl.builder() );
}
public EntityManagerFactory buildEntityManagerFactory(BootstrapServiceRegistryImpl.Builder builder) {
public EntityManagerFactory buildEntityManagerFactory(BootstrapServiceRegistryBuilder builder) {
Thread thread = null;
ClassLoader contextClassLoader = null;

11
hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java
View File

@ -43,8 +43,9 @@ import org.hibernate.ejb.AvailableSettings;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.ejb.EntityManagerFactoryImpl;
import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.junit.After;
@ -67,7 +68,7 @@ public abstract class BaseEntityManagerFunctionalTestCase extends BaseUnitTestCa
private static final Dialect dialect = Dialect.getDialect();
private Ejb3Configuration ejb3Configuration;
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private EntityManagerFactoryImpl entityManagerFactory;
private EntityManager em;
@ -81,7 +82,7 @@ public abstract class BaseEntityManagerFunctionalTestCase extends BaseUnitTestCa
return entityManagerFactory;
}
protected BasicServiceRegistryImpl serviceRegistry() {
protected StandardServiceRegistryImpl serviceRegistry() {
return serviceRegistry;
}
@ -94,12 +95,12 @@ public abstract class BaseEntityManagerFunctionalTestCase extends BaseUnitTestCa
afterConfigurationBuilt( ejb3Configuration );
entityManagerFactory = (EntityManagerFactoryImpl) ejb3Configuration.buildEntityManagerFactory( bootstrapRegistryBuilder() );
serviceRegistry = (BasicServiceRegistryImpl) ( (SessionFactoryImpl) entityManagerFactory.getSessionFactory() ).getServiceRegistry().getParentServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) ( (SessionFactoryImpl) entityManagerFactory.getSessionFactory() ).getServiceRegistry().getParentServiceRegistry();
afterEntityManagerFactoryBuilt();
}
private BootstrapServiceRegistryImpl.Builder bootstrapRegistryBuilder() {
private BootstrapServiceRegistryBuilder bootstrapRegistryBuilder() {
return BootstrapServiceRegistryImpl.builder();
}

9
hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java
View File

@ -34,7 +34,8 @@ import org.hibernate.envers.AuditReader;
import org.hibernate.envers.AuditReaderFactory;
import org.hibernate.envers.event.EnversIntegrator;
import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.junit.Before;
@ -50,7 +51,7 @@ public abstract class AbstractEntityTest extends AbstractEnversTest {
private EntityManager entityManager;
private AuditReader auditReader;
private Ejb3Configuration cfg;
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private boolean audited;
public abstract void configure(Ejb3Configuration cfg);
@ -108,12 +109,12 @@ public abstract class AbstractEntityTest extends AbstractEnversTest {
emf = (EntityManagerFactoryImpl) cfg.buildEntityManagerFactory( createBootstrapRegistryBuilder() );
serviceRegistry = (BasicServiceRegistryImpl) ( (SessionFactoryImpl) emf.getSessionFactory() ).getServiceRegistry().getParentServiceRegistry();
serviceRegistry = (StandardServiceRegistryImpl) ( (SessionFactoryImpl) emf.getSessionFactory() ).getServiceRegistry().getParentServiceRegistry();
newEntityManager();
}
private BootstrapServiceRegistryImpl.Builder createBootstrapRegistryBuilder() {
private BootstrapServiceRegistryBuilder createBootstrapRegistryBuilder() {
return BootstrapServiceRegistryImpl.builder();
}

8
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java vendored
View File

@ -33,7 +33,7 @@ import org.hibernate.cache.infinispan.entity.EntityRegionImpl;
import org.hibernate.cache.infinispan.util.FlagAdapter;
import org.hibernate.cfg.Configuration;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
@ -45,7 +45,7 @@ import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
public class NodeEnvironment {
private final Configuration configuration;
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private InfinispanRegionFactory regionFactory;
private Map<String,EntityRegionImpl> entityRegionMap;
@ -59,7 +59,7 @@ public class NodeEnvironment {
return configuration;
}
public BasicServiceRegistryImpl getServiceRegistry() {
public StandardServiceRegistryImpl getServiceRegistry() {
return serviceRegistry;
}
@ -109,7 +109,7 @@ public class NodeEnvironment {
}
public void prepare() throws Exception {
serviceRegistry = (BasicServiceRegistryImpl) new ServiceRegistryBuilder()
serviceRegistry = (StandardServiceRegistryImpl) new ServiceRegistryBuilder()
.applySettings( configuration.getProperties() )
.buildServiceRegistry();
regionFactory = CacheTestUtil.startRegionFactory( serviceRegistry, configuration );

6
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java vendored
View File

@ -31,7 +31,7 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
@ -142,7 +142,7 @@ public abstract class DualNodeTestCase extends BaseCoreFunctionalTestCase {
public class SecondNodeEnvironment {
private Configuration configuration;
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private SessionFactoryImplementor sessionFactory;
public SecondNodeEnvironment() {
@ -163,7 +163,7 @@ public abstract class DualNodeTestCase extends BaseCoreFunctionalTestCase {
return configuration;
}
public BasicServiceRegistryImpl getServiceRegistry() {
public StandardServiceRegistryImpl getServiceRegistry() {
return serviceRegistry;
}

10
hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
View File

@ -27,23 +27,23 @@ import java.util.Map;
import org.hibernate.cfg.Environment;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
/**
* @author Steve Ebersole
*/
public class ServiceRegistryBuilder {
public static BasicServiceRegistryImpl buildServiceRegistry() {
public static StandardServiceRegistryImpl buildServiceRegistry() {
return buildServiceRegistry( Environment.getProperties() );
}
public static BasicServiceRegistryImpl buildServiceRegistry(Map serviceRegistryConfig) {
return (BasicServiceRegistryImpl) new org.hibernate.service.ServiceRegistryBuilder()
public static StandardServiceRegistryImpl buildServiceRegistry(Map serviceRegistryConfig) {
return (StandardServiceRegistryImpl) new org.hibernate.service.ServiceRegistryBuilder()
.applySettings( serviceRegistryConfig )
.buildServiceRegistry();
}
public static void destroy(ServiceRegistry serviceRegistry) {
( (BasicServiceRegistryImpl) serviceRegistry ).destroy();
( (StandardServiceRegistryImpl) serviceRegistry ).destroy();
}
}

19
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View File

@ -53,11 +53,12 @@ import org.hibernate.mapping.Property;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.metamodel.MetadataSources;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.junit.After;
import org.junit.Before;
@ -85,7 +86,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
private boolean isMetadataUsed;
private Configuration configuration;
private BasicServiceRegistryImpl serviceRegistry;
private StandardServiceRegistryImpl serviceRegistry;
private SessionFactoryImplementor sessionFactory;
private Session session;
@ -98,7 +99,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
return configuration;
}
protected BasicServiceRegistryImpl serviceRegistry() {
protected StandardServiceRegistryImpl serviceRegistry() {
return serviceRegistry;
}
@ -146,7 +147,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
afterSessionFactoryBuilt();
}
private MetadataImplementor buildMetadata(BasicServiceRegistry serviceRegistry) {
private MetadataImplementor buildMetadata(ServiceRegistry serviceRegistry) {
MetadataSources sources = new MetadataSources( serviceRegistry );
addMappings( sources );
return (MetadataImplementor) sources.buildMetadata();
@ -318,7 +319,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
protected void afterConfigurationBuilt(Mappings mappings, Dialect dialect) {
}
protected BasicServiceRegistryImpl buildServiceRegistry(Configuration configuration) {
protected StandardServiceRegistryImpl buildServiceRegistry(Configuration configuration) {
Properties properties = new Properties();
properties.putAll( configuration.getProperties() );
Environment.verifyProperties( properties );
@ -328,16 +329,16 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
ServiceRegistryBuilder registryBuilder = new ServiceRegistryBuilder( bootstrapServiceRegistry )
.applySettings( properties );
prepareBasicRegistryBuilder( registryBuilder );
return (BasicServiceRegistryImpl) registryBuilder.buildServiceRegistry();
return (StandardServiceRegistryImpl) registryBuilder.buildServiceRegistry();
}
protected BootstrapServiceRegistryImpl generateBootstrapRegistry(Properties properties) {
final BootstrapServiceRegistryImpl.Builder builder = BootstrapServiceRegistryImpl.builder();
final BootstrapServiceRegistryBuilder builder = BootstrapServiceRegistryImpl.builder();
prepareBootstrapRegistryBuilder( builder );
return builder.build();
}
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryImpl.Builder builder) {
protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
}
protected void prepareBasicRegistryBuilder(ServiceRegistryBuilder serviceRegistryBuilder) {