Skip to content

Commit

Permalink
HSEARCH-2770 Remove deprecated method SearchIntegrator#getIndexBindin…
Browse files Browse the repository at this point in the history
…g(Class)
  • Loading branch information
Sanne committed Jul 7, 2017
1 parent c8f7665 commit fa3d969
Show file tree
Hide file tree
Showing 31 changed files with 42 additions and 74 deletions.
Expand Up @@ -73,7 +73,6 @@
import org.hibernate.search.spi.impl.ConcurrentIndexedTypeMap;
import org.hibernate.search.spi.impl.ExtendedSearchIntegratorWithShareableState;
import org.hibernate.search.spi.impl.IndexedTypeSets;
import org.hibernate.search.spi.impl.PojoIndexedTypeIdentifier;
import org.hibernate.search.spi.impl.TypeHierarchy;
import org.hibernate.search.spi.impl.SearchFactoryState;
import org.hibernate.search.stat.Statistics;
Expand Down Expand Up @@ -329,12 +328,6 @@ public IndexedTypeMap<EntityIndexBinding> getIndexBindings() {
return indexBindingForEntities;
}

@Override
@Deprecated
public EntityIndexBinding getIndexBinding(Class<?> entityType) {
return indexBindingForEntities.get( new PojoIndexedTypeIdentifier( entityType ) );
}

@Override
public EntityIndexBinding getIndexBinding(IndexedTypeIdentifier entityType) {
return indexBindingForEntities.get( entityType );
Expand Down Expand Up @@ -553,7 +546,7 @@ public EntityIndexBinding getSafeIndexBindingForEntity(Class<?> entityType) {
if ( entityType == null ) {
throw log.nullIsInvalidIndexedType();
}
EntityIndexBinding entityIndexBinding = getIndexBinding( entityType );
EntityIndexBinding entityIndexBinding = getIndexBindings().get( entityType );
if ( entityIndexBinding == null ) {
throw log.notAnIndexedType( entityType.getName() );
}
Expand Down
Expand Up @@ -87,12 +87,6 @@ public IndexedTypeMap<EntityIndexBinding> getIndexBindings() {
return delegate.getIndexBindings();
}

@Override
@Deprecated
public EntityIndexBinding getIndexBinding(Class<?> entityType) {
return delegate.getIndexBinding( entityType );
}

@Override
public Worker getWorker() {
return delegate.getWorker();
Expand Down
Expand Up @@ -178,12 +178,6 @@ public WorkspaceHolder getWorkspaceHolder() {
return workspaceHolder;
}

//Not exposed on the IndexManager interface
@Deprecated
public EntityIndexBinding getIndexBinding(Class<?> entityType) {
return boundSearchIntegrator.getIndexBinding( entityType );
}

//Not exposed on the IndexManager interface
public EntityIndexBinding getIndexBinding(IndexedTypeIdentifier type) {
return boundSearchIntegrator.getIndexBinding( type );
Expand Down
Expand Up @@ -47,19 +47,6 @@ public interface SearchIntegrator extends AutoCloseable {
*/
IndexedTypeMap<EntityIndexBinding> getIndexBindings();

/**
* Returns the entity to index binding for the given type.
*
* @deprecated Use {@link #getIndexBinding(IndexedTypeIdentifier)} instead.
*
* @param entityType the type for which to retrieve the binding
*
* @return the entity to index binding for the given type. {@code null} is returned for types which are unindexed or
* unknown.
*/
@Deprecated
EntityIndexBinding getIndexBinding(Class<?> entityType);

/**
* Returns the entity to index binding for the given type.
* @param entityType the type for which to retrieve the binding
Expand Down
Expand Up @@ -70,7 +70,7 @@ public void shouldBePossibleToAnnotateClass() throws Exception {
@Category(SkipOnElasticsearch.class) // Unused AnalyzerDefs are always bound to the Lucene registry, making this test fail on ES
public void shouldContainOnlyTheDefinedAnalyzers() throws Exception {
ExtendedSearchIntegrator factory = sfHolder.getSearchFactory();
IndexManagerType indexManagerType = factory.getIndexBinding( Sample.class ).getIndexManagerType();
IndexManagerType indexManagerType = factory.getIndexBindings().get( Sample.class ).getIndexManagerType();
Map<String, AnalyzerReference> analyzerReferences =
factory.getIntegration( indexManagerType ).getAnalyzerRegistry().getNamedAnalyzerReferences();
assertThat( analyzerReferences.keySet() ).containsOnly( "package-analyzer", "class-analyzer" );
Expand Down
Expand Up @@ -30,7 +30,7 @@ public class BaseConfigurationTest {
public SearchIntegratorResource integratorResource = new SearchIntegratorResource();

protected static AbstractWorkspaceImpl extractWorkspace(MutableSearchFactory sf, Class<?> type) {
EntityIndexBinding indexBindingForEntity = sf.getIndexBinding( type );
EntityIndexBinding indexBindingForEntity = sf.getIndexBindings().get( type );
DirectoryBasedIndexManager indexManager = (DirectoryBasedIndexManager) indexBindingForEntity.getIndexManagers()[0];
WorkspaceHolder backend = (WorkspaceHolder) indexManager.getWorkspaceHolder();
return backend.getIndexResources().getWorkspace();
Expand Down
Expand Up @@ -44,7 +44,7 @@ public void noOverride() throws Exception {

integrator = init( cfg );
assertThat(
integrator.getIndexBinding( NoAnnotationIndexNameOverrideEntity.class ).getIndexManagers()
integrator.getIndexBindings().get( NoAnnotationIndexNameOverrideEntity.class ).getIndexManagers()
)
.onProperty( "indexName" )
.as( "Index names for entity " + NoAnnotationIndexNameOverrideEntity.class )
Expand All @@ -63,7 +63,7 @@ public void annotationOverride() throws Exception {

integrator = init( cfg );
assertThat(
integrator.getIndexBinding( IndexedAnnotationIndexNameOverriddeEntity.class ).getIndexManagers()
integrator.getIndexBindings().get( IndexedAnnotationIndexNameOverriddeEntity.class ).getIndexManagers()
)
.onProperty( "indexName" )
.as( "Index names for entity " + IndexedAnnotationIndexNameOverriddeEntity.class )
Expand Down Expand Up @@ -91,7 +91,7 @@ public void configurationOverride() throws Exception {
* the declared index name.
*/
assertThat(
integrator.getIndexBinding( NoAnnotationIndexNameOverrideEntity.class ).getIndexManagers()
integrator.getIndexBindings().get( NoAnnotationIndexNameOverrideEntity.class ).getIndexManagers()
)
.onProperty( "indexName" )
.as( "Index names for entity " + NoAnnotationIndexNameOverrideEntity.class )
Expand Down Expand Up @@ -119,7 +119,7 @@ public void configurationAndAnnotationOverride() throws Exception {
* the declared index name.
*/
assertThat(
integrator.getIndexBinding( IndexedAnnotationIndexNameOverriddeEntity.class ).getIndexManagers()
integrator.getIndexBindings().get( IndexedAnnotationIndexNameOverriddeEntity.class ).getIndexManagers()
)
.onProperty( "indexName" )
.as( "Index names for entity " + IndexedAnnotationIndexNameOverriddeEntity.class )
Expand Down
Expand Up @@ -82,7 +82,7 @@ private void verifyOptimizerImplementationIs(Class type, SearchConfigurationForT
cfg.setProgrammaticMapping( mapping );
cfg.addClass( Document.class );
SearchIntegrator sf = integratorResource.create( cfg );
EntityIndexBinding indexBindingForEntity = sf.getIndexBinding( Document.class );
EntityIndexBinding indexBindingForEntity = sf.getIndexBindings().get( Document.class );
DirectoryBasedIndexManager indexManager = (DirectoryBasedIndexManager) indexBindingForEntity.getIndexManagers()[0];
OptimizerStrategy optimizerStrategy = indexManager.getOptimizerStrategy();
Assert.assertTrue( type.isAssignableFrom( optimizerStrategy.getClass() ) );
Expand Down
Expand Up @@ -185,7 +185,7 @@ public void run() {
.newInstance( index, name );
helper.index( entity, index );

EntityIndexBinding indexBindingForEntity = searchIntegrator.getIndexBinding( aClass );
EntityIndexBinding indexBindingForEntity = searchIntegrator.getIndexBindings().get( aClass );
assertNotNull( indexBindingForEntity );

IndexManager[] indexManagers = indexBindingForEntity.getIndexManagers();
Expand Down
Expand Up @@ -68,7 +68,7 @@ public class ShardingConfigurationTest {
public void testNoShardingIsUsedPerDefault() {
MutableSearchFactory searchFactory = getSearchFactory( Collections.<String, String>emptyMap() );

EntityIndexBinding entityIndexBinding = searchFactory.getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = searchFactory.getIndexBindings().get( Foo.class );

IndexManagerSelector selector = entityIndexBinding.getIndexManagerSelector();

Expand All @@ -91,7 +91,7 @@ public void testSettingNumberOfShardsOnlySelectsIdHashSharding() {

MutableSearchFactory searchFactory = getSearchFactory( shardingProperties );

EntityIndexBinding entityIndexBinding = searchFactory.getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = searchFactory.getIndexBindings().get( Foo.class );

IndexManagerSelector selector = entityIndexBinding.getIndexManagerSelector();

Expand Down Expand Up @@ -156,7 +156,7 @@ public void testSettingIdHashShardingStrategyWithoutNumberOfShards() {

logged.expectMessage( "HSEARCH000193", "IdHashShardingStrategy" );

EntityIndexBinding entityIndexBinding = getSearchFactory( shardingProperties ).getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = getSearchFactory( shardingProperties ).getIndexBindings().get( Foo.class );

// 1 is assumed for legacy reasons. IMO not setting the number of shards should throw an exception
assertTrue(
Expand All @@ -176,7 +176,7 @@ public void testSettingCustomIndexShardingStrategy() {

MutableSearchFactory searchFactory = getSearchFactory( shardingProperties );

EntityIndexBinding entityIndexBinding = searchFactory.getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = searchFactory.getIndexBindings().get( Foo.class );

IndexManagerSelector selector = entityIndexBinding.getIndexManagerSelector();

Expand Down Expand Up @@ -209,7 +209,7 @@ public void testSettingCustomShardIdentifierProvider() {

MutableSearchFactory searchFactory = getSearchFactory( shardingProperties );

EntityIndexBinding entityIndexBinding = searchFactory.getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = searchFactory.getIndexBindings().get( Foo.class );

assertEquals(
"Explicitly set shard id provider ignored",
Expand Down Expand Up @@ -242,7 +242,7 @@ public void testSettingCustomShardIdentifierProviderWithExplicitIndexName() {

MutableSearchFactory searchFactory = getSearchFactory( shardingProperties );

EntityIndexBinding entityIndexBinding = searchFactory.getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = searchFactory.getIndexBindings().get( Foo.class );

assertEquals(
"Explicitly set shard id provider ignored",
Expand All @@ -266,7 +266,7 @@ public void testConfiguringDynamicallyCreatedShardViaConfiguration() {

MutableSearchFactory searchFactory = getSearchFactory( shardingProperties );

EntityIndexBinding entityIndexBinding = searchFactory.getIndexBinding( Foo.class );
EntityIndexBinding entityIndexBinding = searchFactory.getIndexBindings().get( Foo.class );
IndexManager indexManagers[] = entityIndexBinding.getIndexManagers();

assertTrue( "There should be two index managers", indexManagers.length == 1 );
Expand Down
Expand Up @@ -154,7 +154,7 @@ public void testOneOfSeveralFieldsIsNumeric() {
}

private Object getUnwrappedBridge(Class<?> clazz, String string, Class<?> expectedBridgeClass) {
FieldBridge bridge = sfHolder.getSearchFactory().getIndexBinding( clazz ).getDocumentBuilder()
FieldBridge bridge = sfHolder.getSearchFactory().getIndexBindings().get( clazz ).getDocumentBuilder()
.getTypeMetadata().getDocumentFieldMetadataFor( string ).getFieldBridge();
return unwrapBridge( bridge, expectedBridgeClass );
}
Expand Down
Expand Up @@ -108,8 +108,8 @@ public void testProvidedId() throws Exception {
Set<String> identifiers = new HashSet<String>();
identifiers.add( "providedId" );
Map<String, EntityIndexBinding> targetedEntityBindings = new HashMap<>();
targetedEntityBindings.put( ProvidedIdPerson.class.getName(), extendedIntegrator.getIndexBinding( ProvidedIdPerson.class ) );
targetedEntityBindings.put( ProvidedIdPersonSub.class.getName(), extendedIntegrator.getIndexBinding( ProvidedIdPersonSub.class ) );
targetedEntityBindings.put( ProvidedIdPerson.class.getName(), extendedIntegrator.getIndexBindings().get( ProvidedIdPerson.class ) );
targetedEntityBindings.put( ProvidedIdPersonSub.class.getName(), extendedIntegrator.getIndexBindings().get( ProvidedIdPersonSub.class ) );
DocumentExtractor extractor = new DocumentExtractorImpl(
queryHits, extendedIntegrator, new String[] { "name" },
identifiers, false,
Expand Down
Expand Up @@ -42,7 +42,7 @@ public class DirectoryBasedIndexManagerTest {
@Test
public void testUnlockIndexWriter() throws Exception {
ExtendedSearchIntegrator searchIntegrator = sfh.getSearchFactory();
IndexManager indexManager = searchIntegrator.getIndexBinding( Entity.class ).getIndexManagers()[0];
IndexManager indexManager = searchIntegrator.getIndexBindings().get( Entity.class ).getIndexManagers()[0];
helper.add( new Entity(), 1 );
assertTrue( isIndexWriterLocked( indexManager ) );

Expand Down
Expand Up @@ -142,7 +142,7 @@ public <T extends Service> SearchFactoryHolder withService(Class<T> serviceType,
}

public IndexManager extractIndexManager(Class indexedType) {
EntityIndexBinding indexBindingForEntity = getSearchFactory().getIndexBinding( indexedType );
EntityIndexBinding indexBindingForEntity = getSearchFactory().getIndexBindings().get( indexedType );
IndexManager indexManager = (IndexManager) indexBindingForEntity.getIndexManagers()[0];
return indexManager;
}
Expand Down
Expand Up @@ -178,7 +178,7 @@ protected boolean matchesSafely(LoggingEvent item) {
* Perform a flush, which implies a refresh
*/
private void flush() {
IndexManager indexManager = getExtendedSearchIntegrator().getIndexBinding( Level1.class ).getIndexManagers()[0];
IndexManager indexManager = getExtendedSearchIntegrator().getIndexBindings().get( Level1.class ).getIndexManagers()[0];
indexManager.performOperations( Collections.singletonList( FlushLuceneWork.INSTANCE ), null );
}

Expand Down
Expand Up @@ -148,7 +148,7 @@ public <T> void index(T entity) {
//TODO cache that at the FTSession level
ExtendedSearchIntegrator extendedIntegrator = getSearchIntegrator();
//not strictly necessary but a small optimization
if ( extendedIntegrator.getIndexBinding( clazz ) == null ) {
if ( extendedIntegrator.getIndexBindings().get( clazz ) == null ) {
String msg = "Entity to index is not an @Indexed entity: " + entity.getClass().getName();
throw new IllegalArgumentException( msg );
}
Expand Down
Expand Up @@ -144,7 +144,7 @@ private static class RootEntityMetadata {

RootEntityMetadata(Class<?> rootEntity, ExtendedSearchIntegrator extendedIntegrator) {
this.rootEntity = rootEntity;
EntityIndexBinding provider = extendedIntegrator.getIndexBinding( rootEntity );
EntityIndexBinding provider = extendedIntegrator.getIndexBindings().get( rootEntity );
if ( provider == null ) {
throw new AssertionFailure( "Provider not found for class: " + rootEntity );
}
Expand Down
Expand Up @@ -99,7 +99,7 @@ public void testOptimizationIsTriggered() throws InterruptedException {

private DirectoryBasedIndexManager getSingleIndexManager(Class<?> clazz) {
SearchIntegrator searchIntegrator = getSearchFactory().unwrap( SearchIntegrator.class );
EntityIndexBinding indexBindingForEntity = searchIntegrator.getIndexBinding( clazz );
EntityIndexBinding indexBindingForEntity = searchIntegrator.getIndexBindings().get( clazz );
IndexManager[] indexManagers = indexBindingForEntity.getIndexManagers();
assertEquals( 1, indexManagers.length );
return (DirectoryBasedIndexManager) indexManagers[0];
Expand Down
Expand Up @@ -38,7 +38,7 @@ public Class<?>[] getAnnotatedClasses() {
@Test
public void testNothingTest() {
SearchIntegrator searchFactory = getSearchFactory().unwrap( SearchIntegrator.class );
EntityIndexBinding indexBindingForEntity = searchFactory.getIndexBinding( Clock.class );
EntityIndexBinding indexBindingForEntity = searchFactory.getIndexBindings().get( Clock.class );
IndexManager[] indexManagers = indexBindingForEntity.getIndexManagers();
assertEquals( 1, indexManagers.length );
DirectoryBasedIndexManager indexManager = (DirectoryBasedIndexManager) indexManagers[0];
Expand Down
Expand Up @@ -203,7 +203,7 @@ private void rebuildIndexWithMassIndexer(Class<?> entityType, String tenantId) t
session.createIndexer( entityType ).purgeAllOnStart( true ).startAndWait();
session.close();

String indexName = getExtendedSearchIntegrator().getIndexBinding( entityType )
String indexName = getExtendedSearchIntegrator().getIndexBindings().get( entityType )
.getIndexManagers()[0].getIndexName();

assertThat( getNumberOfDocumentsInIndexByQuery( indexName, DocumentBuilderIndexedEntity.TENANT_ID_FIELDNAME, tenantId ) ).isGreaterThan( 0 );
Expand All @@ -215,7 +215,7 @@ private void purgeAll(Class<?> entityType, String tenantId) throws IOException {
session.flushToIndexes();
session.close();

String indexName = getExtendedSearchIntegrator().getIndexBinding( entityType )
String indexName = getExtendedSearchIntegrator().getIndexBindings().get( entityType )
.getIndexManagers()[0].getIndexName();

assertThat( getNumberOfDocumentsInIndexByQuery( indexName, DocumentBuilderIndexedEntity.TENANT_ID_FIELDNAME, tenantId ) ).isEqualTo( 0 );
Expand Down
Expand Up @@ -174,7 +174,7 @@ private void purgeAll() {

private void verifyIndexIsLocked(boolean isLocked, Class type) throws IOException {
SearchIntegrator searchIntegrator = builder.getSearchFactory().unwrap( SearchIntegrator.class );
IndexManager indexManager = searchIntegrator.getIndexBinding( type ).getIndexManagers()[0];
IndexManager indexManager = searchIntegrator.getIndexBindings().get( type ).getIndexManagers()[0];

// No need to check for alternative implementations such as ES
if ( indexManager instanceof DirectoryBasedIndexManager ) {
Expand Down
Expand Up @@ -65,7 +65,7 @@ protected final void assertValueIsSet(Class testEntity, int shard, IndexWriterSe
}

private Integer getParameter(int shard, IndexWriterSetting setting, Class testEntity) {
EntityIndexBinding mappingForEntity = getExtendedSearchIntegrator().getIndexBinding( testEntity );
EntityIndexBinding mappingForEntity = getExtendedSearchIntegrator().getIndexBindings().get( testEntity );
DirectoryBasedIndexManager indexManager = (DirectoryBasedIndexManager) mappingForEntity.getIndexManagers()[shard];
LuceneIndexingParameters luceneIndexingParameters = indexManager.getIndexingParameters();
return luceneIndexingParameters.getIndexParameters().getCurrentValueFor( setting );
Expand Down
Expand Up @@ -116,7 +116,7 @@ public void testNumeric() throws Exception {
}

private Object getUnwrappedBridge(Class<?> clazz, String string, Class<?> expectedBridgeClass) {
FieldBridge bridge = getExtendedSearchIntegrator().getIndexBinding( clazz ).getDocumentBuilder()
FieldBridge bridge = getExtendedSearchIntegrator().getIndexBindings().get( clazz ).getDocumentBuilder()
.getTypeMetadata().getDocumentFieldMetadataFor( string ).getFieldBridge();
return unwrapBridge( bridge, expectedBridgeClass );
}
Expand All @@ -138,7 +138,7 @@ public void testNumericDoesNotDuplicateField() throws Exception {
* it used not to be, because the call to numericField used to
* create another, duplicate field, erasing all previous information.
*/
TypeMetadata metadata = getExtendedSearchIntegrator().getIndexBinding( Item.class )
TypeMetadata metadata = getExtendedSearchIntegrator().getIndexBindings().get( Item.class )
.getDocumentBuilder().getTypeMetadata();

assertTrue( metadata.getDocumentFieldMetadataFor( "price" ).isNumeric() );
Expand Down
Expand Up @@ -65,19 +65,19 @@ public void configure(Map<String,Object> cfg) {

@Test
public void testCorrectNumberOfShardsDetected() {
EntityIndexBinding indexBindingForDocument = getExtendedSearchIntegrator().getIndexBinding( Document.class );
EntityIndexBinding indexBindingForDocument = getExtendedSearchIntegrator().getIndexBindings().get( Document.class );
IndexManager[] documentManagers = indexBindingForDocument.getIndexManagers();
assertNotNull( documentManagers );
assertEquals( 4, documentManagers.length );
EntityIndexBinding indexBindingForBooks = getExtendedSearchIntegrator().getIndexBinding( Book.class );
EntityIndexBinding indexBindingForBooks = getExtendedSearchIntegrator().getIndexBindings().get( Book.class );
IndexManager[] bookManagers = indexBindingForBooks.getIndexManagers();
assertNotNull( bookManagers );
assertEquals( 2, bookManagers.length );
}

@Test
public void testSelectionOfShardingStrategy() {
IndexManagerSelector selector = getExtendedSearchIntegrator().getIndexBinding( Document.class ).getIndexManagerSelector();
IndexManagerSelector selector = getExtendedSearchIntegrator().getIndexBindings().get( Document.class ).getIndexManagerSelector();
assertNotNull( selector );
assertEquals( selector.getClass(), IndexShardingStrategyIndexManagerSelector.class );
assertEquals( 4, selector.all().size() );
Expand Down

0 comments on commit fa3d969

Please sign in to comment.