Skip to content

Commit

Permalink
HSEARCH-3922 Rename a few methods prefixed with "get"/"set" in implem…
Browse files Browse the repository at this point in the history 
…entation classes of the ORM mapper
  • Loading branch information
@yrodiere
yrodiere committed May 20, 2020
1 parent 1db53a8 commit 65143e1
Show file tree
Hide file tree
Showing 28 changed files with 88 additions and 100 deletions.
6 changes: 3 additions & 3 deletions .../java/org/hibernate/search/mapper/orm/event/impl/HibernateOrmListenerContextProvider.java
View file
Expand Up @@ -13,11 +13,11 @@

public interface HibernateOrmListenerContextProvider {

HibernateOrmListenerTypeContextProvider getTypeContextProvider();
HibernateOrmListenerTypeContextProvider typeContextProvider();

PojoIndexingPlan<EntityReference> getCurrentIndexingPlan(SessionImplementor session, boolean createIfDoesNotExist);
PojoIndexingPlan<EntityReference> currentIndexingPlan(SessionImplementor session, boolean createIfDoesNotExist);

ConfiguredAutomaticIndexingSynchronizationStrategy getCurrentAutomaticIndexingSynchronizationStrategy(
ConfiguredAutomaticIndexingSynchronizationStrategy currentAutomaticIndexingSynchronizationStrategy(
SessionImplementor session);

}
2 changes: 1 addition & 1 deletion ...a/org/hibernate/search/mapper/orm/event/impl/HibernateOrmListenerTypeContextProvider.java
View file
Expand Up @@ -8,6 +8,6 @@

public interface HibernateOrmListenerTypeContextProvider {

HibernateOrmListenerTypeContext getByHibernateOrmEntityName(String hibernateOrmEntityName);
HibernateOrmListenerTypeContext forHibernateOrmEntityName(String hibernateOrmEntityName);

}
12 changes: 6 additions & 6 deletions ...rc/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java
View file
Expand Up @@ -147,7 +147,7 @@ public void onFlush(FlushEvent event) {
// since the execute phase is supposed to be triggered by the transaction commit
if ( !session.isTransactionInProgress() ) {
// out of transaction it will trigger both of them
contextProvider.getCurrentAutomaticIndexingSynchronizationStrategy( session )
contextProvider.currentAutomaticIndexingSynchronizationStrategy( session )
.executeAndSynchronize( plan );
}
}
Expand Down Expand Up @@ -187,18 +187,18 @@ private HibernateOrmListenerContextProvider doInitialize(

private PojoIndexingPlan<EntityReference> getCurrentIndexingPlan(HibernateOrmListenerContextProvider contextProvider,
SessionImplementor sessionImplementor) {
return contextProvider.getCurrentIndexingPlan( sessionImplementor, true );
return contextProvider.currentIndexingPlan( sessionImplementor, true );
}

private PojoIndexingPlan<EntityReference> getCurrentIndexingPlanIfExisting(HibernateOrmListenerContextProvider contextProvider,
SessionImplementor sessionImplementor) {
return contextProvider.getCurrentIndexingPlan( sessionImplementor, false );
return contextProvider.currentIndexingPlan( sessionImplementor, false );
}

private HibernateOrmListenerTypeContext getTypeContext(HibernateOrmListenerContextProvider contextProvider,
EntityPersister entityPersister) {
String entityName = entityPersister.getEntityName();
return contextProvider.getTypeContextProvider().getByHibernateOrmEntityName( entityName );
return contextProvider.typeContextProvider().forHibernateOrmEntityName( entityName );
}

private void processCollectionEvent(AbstractCollectionEvent event) {
Expand All @@ -211,8 +211,8 @@ private void processCollectionEvent(AbstractCollectionEvent event) {
return;
}

HibernateOrmListenerTypeContext typeContext = contextProvider.getTypeContextProvider()
.getByHibernateOrmEntityName( event.getAffectedOwnerEntityName() );
HibernateOrmListenerTypeContext typeContext = contextProvider.typeContextProvider()
.forHibernateOrmEntityName( event.getAffectedOwnerEntityName() );
if ( typeContext != null ) {
PojoIndexingPlan<?> plan = getCurrentIndexingPlan( contextProvider, event.getSession() );
Object providedId = typeContext.toIndexingPlanProvidedId( event.getAffectedOwnerIdOrNull() );
Expand Down
52 changes: 23 additions & 29 deletions ...r/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMapping.java
View file
Expand Up @@ -200,8 +200,8 @@ public SessionFactory toOrmSessionFactory() {
@Override
public SearchIndexedEntity indexedEntity(Class<?> entityType) {
PojoRawTypeIdentifier<?> typeIdentifier =
typeContextContainer.getTypeIdentifierByJavaClass( entityType );
SearchIndexedEntity type = typeContextContainer.getIndexedByExactType( typeIdentifier );
typeContextContainer.typeIdentifierForJavaClass( entityType );
SearchIndexedEntity type = typeContextContainer.indexedForExactType( typeIdentifier );
if ( type == null ) {
throw log.notIndexedEntityType( entityType );
}
Expand All @@ -211,8 +211,8 @@ public SearchIndexedEntity indexedEntity(Class<?> entityType) {
@Override
public SearchIndexedEntity indexedEntity(String entityName) {
PojoRawTypeIdentifier<?> typeIdentifier =
typeContextContainer.getTypeIdentifierByEntityName( entityName );
SearchIndexedEntity type = typeContextContainer.getIndexedByExactType( typeIdentifier );
typeContextContainer.typeIdentifierForEntityName( entityName );
SearchIndexedEntity type = typeContextContainer.indexedForExactType( typeIdentifier );
if ( type == null ) {
throw log.notIndexedEntityName( entityName );
}
Expand All @@ -221,17 +221,17 @@ public SearchIndexedEntity indexedEntity(String entityName) {

@Override
public Collection<SearchIndexedEntity> allIndexedEntities() {
return Collections.unmodifiableCollection( typeContextContainer.getAllIndexed() );
return Collections.unmodifiableCollection( typeContextContainer.allIndexed() );
}

@Override
public IndexManager indexManager(String indexName) {
return getSearchIntegration().indexManager( indexName );
return searchIntegration().indexManager( indexName );
}

@Override
public Backend backend(String backendName) {
return getSearchIntegration().backend( backendName );
return searchIntegration().backend( backendName );
}

@Override
Expand All @@ -245,12 +245,12 @@ public PojoIndexer createIndexer(SessionImplementor sessionImplementor) {
}

@Override
public EntityLoadingCacheLookupStrategy getCacheLookupStrategy() {
public EntityLoadingCacheLookupStrategy cacheLookupStrategy() {
return cacheLookupStrategy;
}

@Override
public int getFetchSize() {
public int fetchSize() {
return fetchSize;
}

Expand All @@ -259,55 +259,49 @@ public SessionFactoryImplementor sessionFactory() {
return sessionFactory;
}

// FIXME HSEARCH-3922 remove this once the SPIs have been updated.
@Override
public SessionFactoryImplementor getSessionFactory() {
return sessionFactory;
}

@Override
public ThreadPoolProvider getThreadPoolProvider() {
public ThreadPoolProvider threadPoolProvider() {
return delegate().threadPoolProvider();
}

@Override
public FailureHandler getFailureHandler() {
public FailureHandler failureHandler() {
return delegate().failureHandler();
}

@Override
public HibernateOrmScopeSessionContext getSessionContext(EntityManager entityManager) {
public HibernateOrmScopeSessionContext sessionContext(EntityManager entityManager) {
return HibernateOrmSearchSession.get( this, HibernateOrmUtils.toSessionImplementor( entityManager ) );
}

@Override
public DetachedBackendSessionContext getDetachedBackendSessionContext(String tenantId) {
public DetachedBackendSessionContext detachedBackendSessionContext(String tenantId) {
return DetachedBackendSessionContext.of( this, tenantId );
}

@Override
public PojoIndexingPlan<EntityReference> getCurrentIndexingPlan(SessionImplementor session,
public PojoIndexingPlan<EntityReference> currentIndexingPlan(SessionImplementor session,
boolean createIfDoesNotExist) {
return HibernateOrmSearchSession.get( this, session ).currentIndexingPlan( createIfDoesNotExist );
}

@Override
public ConfiguredAutomaticIndexingSynchronizationStrategy getCurrentAutomaticIndexingSynchronizationStrategy(
public ConfiguredAutomaticIndexingSynchronizationStrategy currentAutomaticIndexingSynchronizationStrategy(
SessionImplementor session) {
return HibernateOrmSearchSession.get( this, session )
.configuredAutomaticIndexingSynchronizationStrategy();
}

@Override
public HibernateOrmTypeContextContainer getTypeContextProvider() {
public HibernateOrmTypeContextContainer typeContextProvider() {
return typeContextContainer;
}

@Override
public <T> SearchScopeImpl<T> createScope(Collection<? extends Class<? extends T>> classes) {
List<PojoRawTypeIdentifier<? extends T>> typeIdentifiers = new ArrayList<>( classes.size() );
for ( Class<? extends T> clazz : classes ) {
typeIdentifiers.add( typeContextContainer.getTypeIdentifierByJavaClass( clazz ) );
typeIdentifiers.add( typeContextContainer.typeIdentifierForJavaClass( clazz ) );
}
return doCreateScope( typeIdentifiers );
}
Expand All @@ -316,7 +310,7 @@ public <T> SearchScopeImpl<T> createScope(Collection<? extends Class<? extends T
public <T> SearchScopeImpl<T> createScope(Class<T> expectedSuperType, Collection<String> entityNames) {
List<PojoRawTypeIdentifier<? extends T>> typeIdentifiers = new ArrayList<>( entityNames.size() );
for ( String entityName : entityNames ) {
typeIdentifiers.add( getEntityTypeIdentifier( expectedSuperType, entityName ) );
typeIdentifiers.add( entityTypeIdentifier( expectedSuperType, entityName ) );
}
return doCreateScope( typeIdentifiers );
}
Expand All @@ -337,14 +331,14 @@ public HibernateOrmSearchSession.Builder createSessionBuilder(
);
}

private SearchIntegration getSearchIntegration() {
private SearchIntegration searchIntegration() {
return HibernateSearchContextProviderService.get( sessionFactory() ).getIntegration();
}

private <T> PojoRawTypeIdentifier<? extends T> getEntityTypeIdentifier(Class<T> expectedSuperType,
private <T> PojoRawTypeIdentifier<? extends T> entityTypeIdentifier(Class<T> expectedSuperType,
String entityName) {
PojoRawTypeIdentifier<?> typeIdentifier =
typeContextContainer.getTypeIdentifierByEntityName( entityName );
typeContextContainer.typeIdentifierForEntityName( entityName );
Class<?> actualJavaType = typeIdentifier.javaClass();
if ( !expectedSuperType.isAssignableFrom( actualJavaType ) ) {
throw log.invalidEntitySuperType( entityName, expectedSuperType, actualJavaType );
Expand All @@ -359,7 +353,7 @@ private Optional<SearchScopeImpl<Object>> createAllScope() {
return delegate()
.<EntityReference, HibernateOrmScopeIndexedTypeContext<?>>createPojoAllScope(
this,
typeContextContainer::getIndexedByExactType
typeContextContainer::indexedForExactType
)
.map( scopeDelegate -> new SearchScopeImpl<>( this, scopeDelegate ) );
}
Expand All @@ -369,7 +363,7 @@ private <T> SearchScopeImpl<T> doCreateScope(Collection<PojoRawTypeIdentifier<?
delegate().createPojoScope(
this,
typeIdentifiers,
typeContextContainer::getIndexedByExactType
typeContextContainer::indexedForExactType
);

return new SearchScopeImpl<T>( this, scopeDelegate );
Expand Down
20 changes: 10 additions & 10 deletions ...n/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmTypeContextContainer.java
View file
Expand Up @@ -56,23 +56,23 @@ private HibernateOrmTypeContextContainer(Builder builder, SessionFactoryImplemen

@Override
@SuppressWarnings("unchecked")
public <E> HibernateOrmIndexedTypeContext<E> getIndexedByExactType(PojoRawTypeIdentifier<E> typeIdentifier) {
public <E> HibernateOrmIndexedTypeContext<E> indexedForExactType(PojoRawTypeIdentifier<E> typeIdentifier) {
return (HibernateOrmIndexedTypeContext<E>) indexedTypeContexts.get( typeIdentifier );
}

@Override
public HibernateOrmIndexedTypeContext<?> getIndexedByJpaEntityName(String indexName) {
public HibernateOrmIndexedTypeContext<?> indexedForJpaEntityName(String indexName) {
return indexedTypeContextsByJpaEntityName.get( indexName );
}

@Override
@SuppressWarnings("unchecked")
public <E> HibernateOrmContainedTypeContext<E> getContainedByExactType(PojoRawTypeIdentifier<E> typeIdentifier) {
public <E> HibernateOrmContainedTypeContext<E> containedForExactType(PojoRawTypeIdentifier<E> typeIdentifier) {
return (HibernateOrmContainedTypeContext<E>) containedTypeContexts.get( typeIdentifier );
}

@Override
public AbstractHibernateOrmTypeContext<?> getByHibernateOrmEntityName(String hibernateOrmEntityName) {
public AbstractHibernateOrmTypeContext<?> forHibernateOrmEntityName(String hibernateOrmEntityName) {
AbstractHibernateOrmTypeContext<?> result =
indexedTypeContextsByHibernateOrmEntityName.get( hibernateOrmEntityName );
if ( result != null ) {
Expand All @@ -85,29 +85,29 @@ public AbstractHibernateOrmTypeContext<?> getByHibernateOrmEntityName(String hib
}

@Override
public <T> PojoRawTypeIdentifier<T> getTypeIdentifierByJavaClass(Class<T> clazz) {
public <T> PojoRawTypeIdentifier<T> typeIdentifierForJavaClass(Class<T> clazz) {
return typeIdentifierResolver.resolveByJavaClass( clazz );
}

@Override
public PojoRawTypeIdentifier<?> getTypeIdentifierByHibernateOrmEntityName(String entityName) {
public PojoRawTypeIdentifier<?> typeIdentifierForHibernateOrmEntityName(String entityName) {
PojoRawTypeIdentifier<?> result = typeIdentifierResolver.resolveByHibernateOrmEntityName( entityName );
if ( result == null ) {
throw log.invalidEntityName( entityName, typeIdentifierResolver.getKnownHibernateOrmEntityNames() );
throw log.invalidEntityName( entityName, typeIdentifierResolver.allKnownHibernateOrmEntityNames() );
}
return result;
}

@Override
public PojoRawTypeIdentifier<?> getTypeIdentifierByEntityName(String entityName) {
public PojoRawTypeIdentifier<?> typeIdentifierForEntityName(String entityName) {
PojoRawTypeIdentifier<?> result = typeIdentifierResolver.resolveByJpaOrHibernateOrmEntityName( entityName );
if ( result == null ) {
throw log.invalidEntityName( entityName, typeIdentifierResolver.getKnownJpaOrHibernateOrmEntityNames() );
throw log.invalidEntityName( entityName, typeIdentifierResolver.allKnownJpaOrHibernateOrmEntityNames() );
}
return result;
}

Collection<HibernateOrmIndexedTypeContext<?>> getAllIndexed() {
Collection<HibernateOrmIndexedTypeContext<?>> allIndexed() {
return indexedTypeContexts.values();
}

Expand Down
2 changes: 1 addition & 1 deletion ...orm/src/main/java/org/hibernate/search/mapper/orm/massindexing/impl/BatchCoordinator.java
View file
Expand Up @@ -137,7 +137,7 @@ private void cancelPendingTasks() {
* @throws InterruptedException if interrupted while waiting for endAllSignal.
*/
private void doBatchWork() throws InterruptedException {
ExecutorService executor = mappingContext.getThreadPoolProvider()
ExecutorService executor = mappingContext.threadPoolProvider()
.newFixedThreadPool( typesToIndexInParallel, MassIndexerImpl.THREAD_NAME_PREFIX + "Workspace" );
for ( HibernateOrmMassIndexingIndexedTypeContext<?> type : rootEntityTypes ) {
indexingFutures.add( Futures.runAsync( createBatchIndexingWorkspace( type ), executor ) );
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/org/hibernate/search/mapper/orm/massindexing/impl/BatchIndexingWorkspace.java
View file
Expand Up @@ -93,7 +93,7 @@ public void runWithFailureHandler() throws InterruptedException {
}

final BatchTransactionalContext transactionalContext =
new BatchTransactionalContext( mappingContext.getSessionFactory() );
new BatchTransactionalContext( mappingContext.sessionFactory() );
// First start the consumers, then the producers (reverse order):
startIndexing();
startProducingPrimaryKeys( transactionalContext );
Expand Down Expand Up @@ -129,7 +129,7 @@ private void startProducingPrimaryKeys(BatchTransactionalContext transactionalCo
transactionalContext,
getNotifier(),
new IdentifierProducer<>(
mappingContext.getSessionFactory(), sessionContext.tenantIdentifier(),
mappingContext.sessionFactory(), sessionContext.tenantIdentifier(),
getNotifier(),
primaryKeyStream,
objectLoadingBatchSize,
Expand All @@ -140,7 +140,7 @@ private void startProducingPrimaryKeys(BatchTransactionalContext transactionalCo
transactionTimeout, sessionContext.tenantIdentifier()
);
//execIdentifiersLoader has size 1 and is not configurable: ensures the list is consistent as produced by one transaction
final ThreadPoolExecutor identifierProducingExecutor = mappingContext.getThreadPoolProvider().newFixedThreadPool(
final ThreadPoolExecutor identifierProducingExecutor = mappingContext.threadPoolProvider().newFixedThreadPool(
1,
MassIndexerImpl.THREAD_NAME_PREFIX + type.getJpaEntityName() + " - ID loading"
);
Expand All @@ -161,7 +161,7 @@ private void startIndexing() {
cacheMode,
transactionTimeout
);
final ThreadPoolExecutor indexingExecutor = mappingContext.getThreadPoolProvider().newFixedThreadPool(
final ThreadPoolExecutor indexingExecutor = mappingContext.threadPoolProvider().newFixedThreadPool(
documentBuilderThreads,
MassIndexerImpl.THREAD_NAME_PREFIX + type.getJpaEntityName() + " - Entity loading"
);
Expand Down
6 changes: 3 additions & 3 deletions ...hibernate/search/mapper/orm/massindexing/impl/HibernateOrmMassIndexingMappingContext.java
View file
Expand Up @@ -14,11 +14,11 @@

public interface HibernateOrmMassIndexingMappingContext {

SessionFactoryImplementor getSessionFactory();
SessionFactoryImplementor sessionFactory();

ThreadPoolProvider getThreadPoolProvider();
ThreadPoolProvider threadPoolProvider();

FailureHandler getFailureHandler();
FailureHandler failureHandler();

PojoIndexer createIndexer(SessionImplementor sessionImplementor);

Expand Down
4 changes: 2 additions & 2 deletions ...org/hibernate/search/mapper/orm/massindexing/impl/IdentifierConsumerDocumentProducer.java
View file
Expand Up @@ -79,7 +79,7 @@ public class IdentifierConsumerDocumentProducer<E, I> implements Runnable {
this.type = type;
this.idAttributeOfType = idAttributeOfType;
this.transactionTimeout = transactionTimeout;
this.transactionManager = mappingContext.getSessionFactory()
this.transactionManager = mappingContext.sessionFactory()
.getServiceRegistry()
.getService( JtaPlatform.class )
.retrieveTransactionManager();
Expand All @@ -90,7 +90,7 @@ public class IdentifierConsumerDocumentProducer<E, I> implements Runnable {
@Override
public void run() {
log.trace( "started" );
try ( SessionImplementor session = (SessionImplementor) mappingContext.getSessionFactory()
try ( SessionImplementor session = (SessionImplementor) mappingContext.sessionFactory()
.withOptions()
.tenantIdentifier( tenantId )
.openSession() ) {
Expand Down
4 changes: 2 additions & 2 deletions .../orm/src/main/java/org/hibernate/search/mapper/orm/massindexing/impl/MassIndexerImpl.java
View file
Expand Up @@ -180,7 +180,7 @@ public MassIndexer monitor(MassIndexingMonitor monitor) {
@Override
public CompletableFuture<?> start() {
BatchCoordinator coordinator = createCoordinator();
ExecutorService executor = mappingContext.getThreadPoolProvider()
ExecutorService executor = mappingContext.threadPoolProvider()
.newFixedThreadPool( 1, THREAD_NAME_PREFIX + "Coordinator" );
try {
return Futures.runAsync( coordinator, executor );
Expand Down Expand Up @@ -239,7 +239,7 @@ public MassIndexer failureHandler(MassIndexingFailureHandler failureHandler) {
private MassIndexingFailureHandler getOrCreateFailureHandler() {
MassIndexingFailureHandler result = failureHandler;
if ( result == null ) {
result = new DelegatingMassIndexingFailureHandler( mappingContext.getFailureHandler() );
result = new DelegatingMassIndexingFailureHandler( mappingContext.failureHandler() );
}
result = new FailSafeMassIndexingFailureHandlerWrapper( result );
return result;
Expand Down

0 comments on commit 65143e1

Please sign in to comment.