Skip to content

Commit

Permalink
renamed NamedQueryRepository to `NamedObjectRepository
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebersole
sebersole committed Nov 6, 2020
1 parent b0b478c commit 4f4b42c
Show file tree
Hide file tree
Showing 25 changed files with 94 additions and 87 deletions.
6 changes: 2 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
View file
Expand Up @@ -86,8 +86,6 @@
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.internal.CoreLogging;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
Expand All @@ -105,7 +103,7 @@
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.UniqueKey;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
Expand Down Expand Up @@ -222,7 +220,7 @@ public Database getDatabase() {
}

@Override
public NamedQueryRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory) {
public NamedObjectRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory) {
throw new UnsupportedOperationException( "#buildNamedQueryRepository should not be called on InFlightMetadataCollector" );
}

Expand Down
9 changes: 4 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
View file
Expand Up @@ -54,9 +54,8 @@
import org.hibernate.mapping.Table;
import org.hibernate.procedure.spi.NamedCallableQueryMemento;
import org.hibernate.query.hql.spi.NamedHqlQueryMemento;
import org.hibernate.query.internal.NamedQueryRepositoryImpl;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.internal.NamedObjectRepositoryImpl;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.sql.spi.NamedNativeQueryMemento;
import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
import org.hibernate.service.spi.ServiceRegistryImplementor;
Expand Down Expand Up @@ -317,8 +316,8 @@ public java.util.Collection<Table> collectTableMappings() {
}

@Override
public NamedQueryRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory) {
return new NamedQueryRepositoryImpl(
public NamedObjectRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory) {
return new NamedObjectRepositoryImpl(
CollectionHelper.mapOfSize( namedQueryMap.size() ),
CollectionHelper.mapOfSize( namedNativeQueryMap.size() ),
CollectionHelper.mapOfSize( namedProcedureCallMap.size() ),
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/boot/query/FetchDescriptor.java
View file
Expand Up @@ -6,10 +6,10 @@
*/
package org.hibernate.boot.query;

import org.hibernate.query.EntityIdentifierNavigablePath;
import org.hibernate.query.NavigablePath;
import org.hibernate.query.named.FetchMemento;
import org.hibernate.query.internal.ResultSetMappingResolutionContext;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.named.ResultMemento;

/**
Expand All @@ -18,7 +18,7 @@
public interface FetchDescriptor {
/**
* Resolve the descriptor into a memento capable of being stored in the
* {@link org.hibernate.query.named.NamedQueryRepository}
* {@link NamedObjectRepository}
*/
FetchMemento resolve(ResultSetMappingResolutionContext resolutionContext);

Expand Down
7 changes: 4 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/boot/query/NamedResultSetMappingDescriptor.java
View file
Expand Up @@ -7,6 +7,7 @@
package org.hibernate.boot.query;

import org.hibernate.query.internal.ResultSetMappingResolutionContext;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.spi.QueryEngine;

Expand All @@ -15,7 +16,7 @@
* of native and procedure queries.
*
* Ultimately used to generate a NamedResultSetMappingMemento that is
* stored in the {@link org.hibernate.query.named.NamedQueryRepository}
* stored in the {@link NamedObjectRepository}
* for availability at runtime
*
* @author Steve Ebersole
Expand All @@ -28,9 +29,9 @@ public interface NamedResultSetMappingDescriptor {

/**
* Create a representation of the described ResultSet mapping for the purpose of
* being stored in Hibernate's {@link org.hibernate.query.named.NamedQueryRepository}
* being stored in Hibernate's {@link NamedObjectRepository}
*
* @see QueryEngine#getNamedQueryRepository()
* @see QueryEngine#getNamedObjectRepository()
*/
NamedResultSetMappingMemento resolve(ResultSetMappingResolutionContext resolutionContext);
}
3 changes: 2 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/query/ResultDescriptor.java
View file
Expand Up @@ -6,6 +6,7 @@
*/
package org.hibernate.boot.query;

import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.named.ResultMemento;
import org.hibernate.query.internal.ResultSetMappingResolutionContext;

Expand All @@ -17,7 +18,7 @@
public interface ResultDescriptor {
/**
* Resolve the descriptor into a memento capable of being stored in the
* {@link org.hibernate.query.named.NamedQueryRepository}
* {@link NamedObjectRepository}
*/
ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext);
}
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadata.java
View file
Expand Up @@ -30,7 +30,7 @@
import org.hibernate.mapping.MappedSuperclass;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
import org.hibernate.type.Type;
import org.hibernate.type.spi.TypeConfiguration;
Expand Down Expand Up @@ -230,7 +230,7 @@ public void initSessionFactory(SessionFactoryImplementor sessionFactory) {


@Override
public NamedQueryRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory) {
public NamedObjectRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory) {
return delegate.buildNamedQueryRepository( sessionFactory );
}
}
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
View file
Expand Up @@ -13,7 +13,7 @@
import org.hibernate.engine.spi.Mapping;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.mapping.MappedSuperclass;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.type.spi.TypeConfiguration;

/**
Expand All @@ -38,7 +38,7 @@ public interface MetadataImplementor extends Metadata, Mapping {
*/
TypeConfiguration getTypeConfiguration();

NamedQueryRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory);
NamedObjectRepository buildNamedQueryRepository(SessionFactoryImplementor sessionFactory);

void validate() throws MappingException;

Expand Down
12 changes: 6 additions & 6 deletions hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
View file
Expand Up @@ -701,7 +701,7 @@ public NativeQueryImplementor createNativeQuery(String sqlString, String resultS
try {
if ( StringHelper.isNotEmpty( resultSetMappingName ) ) {
final NamedResultSetMappingMemento resultSetMappingMemento = getFactory().getQueryEngine()
.getNamedQueryRepository()
.getNamedObjectRepository()
.getResultSetMappingMemento( resultSetMappingName );

if ( resultSetMappingMemento == null ) {
Expand Down Expand Up @@ -772,7 +772,7 @@ protected <T> QueryImplementor<T> buildNamedQuery(String queryName, Class<T> res

// first see if it is a named HQL query
final NamedHqlQueryMemento namedHqlDescriptor = getFactory().getQueryEngine()
.getNamedQueryRepository()
.getNamedObjectRepository()
.getHqlQueryMemento( queryName );

if ( namedHqlDescriptor != null ) {
Expand All @@ -784,7 +784,7 @@ protected <T> QueryImplementor<T> buildNamedQuery(String queryName, Class<T> res

// otherwise, see if it is a named native query
final NamedNativeQueryMemento namedNativeDescriptor = getFactory().getQueryEngine()
.getNamedQueryRepository()
.getNamedObjectRepository()
.getNativeQueryMemento( queryName );

if ( namedNativeDescriptor != null ) {
Expand All @@ -806,7 +806,7 @@ protected void applyQuerySettingsAndHints(Query query) {
@Override
public NativeQueryImplementor getNamedNativeQuery(String queryName) {
final NamedNativeQueryMemento namedNativeDescriptor = getFactory().getQueryEngine()
.getNamedQueryRepository()
.getNamedObjectRepository()
.getNativeQueryMemento( queryName );

if ( namedNativeDescriptor != null ) {
Expand All @@ -819,7 +819,7 @@ public NativeQueryImplementor getNamedNativeQuery(String queryName) {
@Override
public NativeQueryImplementor getNamedNativeQuery(String queryName, String resultSetMapping) {
final NamedNativeQueryMemento namedNativeDescriptor = getFactory().getQueryEngine()
.getNamedQueryRepository()
.getNamedObjectRepository()
.getNativeQueryMemento( queryName );

if ( namedNativeDescriptor != null ) {
Expand All @@ -834,7 +834,7 @@ public NativeQueryImplementor getNamedNativeQuery(String queryName, String resul
public ProcedureCall getNamedProcedureCall(String name) {
checkOpen();

final NamedCallableQueryMemento memento = factory.getQueryEngine().getNamedQueryRepository().getCallableQueryMemento( name );
final NamedCallableQueryMemento memento = factory.getQueryEngine().getNamedObjectRepository().getCallableQueryMemento( name );
if ( memento == null ) {
throw new IllegalArgumentException(
"Could not find named stored procedure call with that registration name : " + name
Expand Down
8 changes: 4 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
View file
Expand Up @@ -310,7 +310,7 @@ public void sessionFactoryClosed(SessionFactory factory) {
this.queryEngine.prepare( this, bootMetamodel, bootstrapContext );

if ( options.isNamedQueryStartupCheckingEnabled() ) {
queryEngine.getNamedQueryRepository().checkNamedQueries( queryEngine );
queryEngine.getNamedObjectRepository().checkNamedQueries( queryEngine );
}

// todo (6.0) : manage old getMultiTableBulkIdStrategy
Expand Down Expand Up @@ -854,7 +854,7 @@ public void addNamedQuery(String name, Query query) {
try {
final ProcedureCallImplementor unwrapped = query.unwrap( ProcedureCallImplementor.class );
if ( unwrapped != null ) {
getQueryEngine().getNamedQueryRepository().registerCallableQueryMemento(
getQueryEngine().getNamedObjectRepository().registerCallableQueryMemento(
name,
unwrapped.toMemento( name )
);
Expand All @@ -871,13 +871,13 @@ public void addNamedQuery(String name, Query query) {
if ( hibernateQuery != null ) {
// create and register the proper NamedQueryDefinition...
if ( hibernateQuery instanceof NativeQueryImplementor ) {
getQueryEngine().getNamedQueryRepository().registerNativeQueryMemento(
getQueryEngine().getNamedObjectRepository().registerNativeQueryMemento(
name,
( (NativeQueryImplementor) hibernateQuery ).toMemento( name )
);
}
else {
getQueryEngine().getNamedQueryRepository().registerHqlQueryMemento(
getQueryEngine().getNamedObjectRepository().registerHqlQueryMemento(
name,
( ( HqlQueryImplementor ) hibernateQuery ).toMemento( name )
);
Expand Down
3 changes: 1 addition & 2 deletions hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View file
Expand Up @@ -113,7 +113,6 @@
import org.hibernate.graph.GraphSemantic;
import org.hibernate.graph.RootGraph;
import org.hibernate.graph.internal.RootGraphImpl;
import org.hibernate.graph.spi.GraphImplementor;
import org.hibernate.graph.spi.RootGraphImplementor;
import org.hibernate.jpa.AvailableSettings;
import org.hibernate.jpa.QueryHints;
Expand Down Expand Up @@ -3023,7 +3022,7 @@ public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
checkOpen();
try {
final NamedCallableQueryMemento memento = getFactory().getQueryEngine()
.getNamedQueryRepository()
.getNamedObjectRepository()
.getCallableQueryMemento( name );
if ( memento == null ) {
throw new IllegalArgumentException( "No @NamedStoredProcedureQuery was found with that name : " + name );
Expand Down
8 changes: 4 additions & 4 deletions ...rc/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
View file
Expand Up @@ -12,7 +12,7 @@
import org.hibernate.loader.ast.spi.SingleIdEntityLoader;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.query.named.NamedQueryMemento;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.spi.QueryImplementor;
import org.hibernate.query.sql.spi.NamedNativeQueryMemento;

Expand Down Expand Up @@ -41,14 +41,14 @@ public SingleIdEntityLoaderProvidedQueryImpl(
private static NamedQueryMemento resolveNamedQuery(
String queryName,
SessionFactoryImplementor sf) {
final NamedQueryRepository namedQueryRepository = sf.getQueryEngine().getNamedQueryRepository();
final NamedObjectRepository namedObjectRepository = sf.getQueryEngine().getNamedObjectRepository();

final NamedNativeQueryMemento nativeQueryMemento = namedQueryRepository.getNativeQueryMemento( queryName );
final NamedNativeQueryMemento nativeQueryMemento = namedObjectRepository.getNativeQueryMemento( queryName );
if ( nativeQueryMemento != null ) {
return nativeQueryMemento;
}

return namedQueryRepository.getHqlQueryMemento( queryName );
return namedObjectRepository.getHqlQueryMemento( queryName );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
View file
Expand Up @@ -11,7 +11,7 @@
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.query.internal.ResultSetMappingResolutionContext;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.results.ResultSetMapping;

Expand Down Expand Up @@ -53,10 +53,10 @@ public static void resolveResultSetMappingNames(
ResultSetMapping resultSetMapping,
Consumer<String> querySpaceConsumer,
ResultSetMappingResolutionContext context) {
final NamedQueryRepository namedQueryRepository = context.getSessionFactory().getQueryEngine().getNamedQueryRepository();
final NamedObjectRepository namedObjectRepository = context.getSessionFactory().getQueryEngine().getNamedObjectRepository();

for ( String resultSetMappingName : resultSetMappingNames ) {
final NamedResultSetMappingMemento memento = namedQueryRepository.getResultSetMappingMemento( resultSetMappingName );
final NamedResultSetMappingMemento memento = namedObjectRepository.getResultSetMappingMemento( resultSetMappingName );
memento.resolve(
resultSetMapping,
querySpaceConsumer,
Expand Down
8 changes: 4 additions & 4 deletions ...ry/internal/NamedQueryRepositoryImpl.java → ...y/internal/NamedObjectRepositoryImpl.java
View file
Expand Up @@ -17,7 +17,7 @@
import org.hibernate.procedure.spi.NamedCallableQueryMemento;
import org.hibernate.query.hql.HqlTranslator;
import org.hibernate.query.hql.spi.NamedHqlQueryMemento;
import org.hibernate.query.named.NamedQueryRepository;
import org.hibernate.query.named.NamedObjectRepository;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.spi.QueryEngine;
import org.hibernate.query.spi.QueryInterpretationCache;
Expand All @@ -28,15 +28,15 @@
/**
* @author Steve Ebersole
*/
public class NamedQueryRepositoryImpl implements NamedQueryRepository {
private static final Logger log = Logger.getLogger( NamedQueryRepository.class );
public class NamedObjectRepositoryImpl implements NamedObjectRepository {
private static final Logger log = Logger.getLogger( NamedObjectRepository.class );

private final Map<String, NamedHqlQueryMemento> hqlMementoMap;
private final Map<String, NamedNativeQueryMemento> sqlMementoMap;
private final Map<String, NamedCallableQueryMemento> callableMementoMap;
private final Map<String, NamedResultSetMappingMemento> resultSetMappingMementoMap;

public NamedQueryRepositoryImpl(
public NamedObjectRepositoryImpl(
Map<String,NamedHqlQueryMemento> hqlMementoMap,
Map<String,NamedNativeQueryMemento> sqlMementoMap,
Map<String,NamedCallableQueryMemento> callableMementoMap,
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/query/named/NameableQuery.java
View file
Expand Up @@ -10,7 +10,7 @@

/**
* Contract for Query impls that can be converted to a named query memento to be
* stored in the {@link NamedQueryRepository}
* stored in the {@link NamedObjectRepository}
*
* @author Steve Ebersole
*/
Expand Down
2 changes: 1 addition & 1 deletion ...ate/query/named/NamedQueryRepository.java → ...te/query/named/NamedObjectRepository.java
View file
Expand Up @@ -27,7 +27,7 @@
* @author Steve Ebersole
*/
@Incubating
public interface NamedQueryRepository {
public interface NamedObjectRepository {

// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Named HQL Memento
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java
View file
Expand Up @@ -17,7 +17,7 @@

/**
* The runtime representation of named queries. They are stored in and
* available through the QueryEngine's {@link NamedQueryRepository}.
* available through the QueryEngine's {@link NamedObjectRepository}.
*
* This is the base contract for all specific types of named query mementos
*
Expand Down

0 comments on commit 4f4b42c

Please sign in to comment.