HSEARCH-2770 Remove deprecated method getDocumentBuilderContainedEnti…

…ty(Class)
hibernate · Jul 7, 2017 · b14a058 · b14a058
1 parent c389bce
commit b14a058
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/engine/src/main/java/org/hibernate/search/engine/impl/ImmutableSearchFactory.java b/engine/src/main/java/org/hibernate/search/engine/impl/ImmutableSearchFactory.java
@@ -346,12 +346,6 @@ public EntityIndexBinding getIndexBinding(IndexedTypeIdentifier entityType) {
 		return indexBindingForEntities.get( entityType );
 	}
 
-	@Override
-	@Deprecated
-	public DocumentBuilderContainedEntity getDocumentBuilderContainedEntity(Class entityType) {
-		return documentBuildersContainedEntities.get( entityType );
-	}
-
 	@Override
 	public DocumentBuilderContainedEntity getDocumentBuilderContainedEntity(IndexedTypeIdentifier entityType) {
 		return documentBuildersContainedEntities.get( entityType );

diff --git a/engine/src/main/java/org/hibernate/search/engine/impl/MutableSearchFactory.java b/engine/src/main/java/org/hibernate/search/engine/impl/MutableSearchFactory.java
@@ -93,11 +93,6 @@ public EntityIndexBinding getIndexBinding(Class<?> entityType) {
 		return delegate.getIndexBinding( entityType );
 	}
 
-	@Override
-	public DocumentBuilderContainedEntity getDocumentBuilderContainedEntity(Class<?> entityType) {
-		return delegate.getDocumentBuilderContainedEntity( entityType );
-	}
-
 	@Override
 	public Worker getWorker() {
 		return delegate.getWorker();

diff --git a/.../src/main/java/org/hibernate/search/engine/integration/impl/ExtendedSearchIntegrator.java b/.../src/main/java/org/hibernate/search/engine/integration/impl/ExtendedSearchIntegrator.java
@@ -34,9 +34,6 @@
  */
 public interface ExtendedSearchIntegrator extends SearchIntegrator {
 
-	@Deprecated
-	DocumentBuilderContainedEntity getDocumentBuilderContainedEntity(Class<?> entityType);
-
 	DocumentBuilderContainedEntity getDocumentBuilderContainedEntity(IndexedTypeIdentifier entityType);
 
 	FilterCachingStrategy getFilterCachingStrategy();

diff --git a/orm/src/main/java/org/hibernate/search/event/impl/FullTextIndexEventListener.java b/orm/src/main/java/org/hibernate/search/event/impl/FullTextIndexEventListener.java
@@ -40,6 +40,7 @@
 import org.hibernate.search.engine.integration.impl.ExtendedSearchIntegrator;
 import org.hibernate.search.engine.spi.AbstractDocumentBuilder;
 import org.hibernate.search.engine.spi.EntityIndexBinding;
+import org.hibernate.search.spi.IndexedTypeIdentifier;
 import org.hibernate.search.spi.IndexingMode;
 import org.hibernate.search.util.impl.Maps;
 import org.hibernate.search.util.logging.impl.Log;
@@ -280,12 +281,13 @@ private Serializable getId(Object entity, AbstractCollectionEvent event) {
 	protected AbstractDocumentBuilder getDocumentBuilder(final Object instance) {
 		ExtendedSearchIntegrator integrator = getExtendedSearchFactoryIntegrator();
 		Class<?> clazz = instance.getClass();
-		EntityIndexBinding entityIndexBinding = integrator.getIndexBinding( clazz );
+		IndexedTypeIdentifier type = integrator.getIndexBindings().keyFromPojoType( clazz );
+		EntityIndexBinding entityIndexBinding = integrator.getIndexBinding( type );
 		if ( entityIndexBinding != null ) {
 			return entityIndexBinding.getDocumentBuilder();
 		}
 		else {
-			return integrator.getDocumentBuilderContainedEntity( clazz );
+			return integrator.getDocumentBuilderContainedEntity( type );
 		}
 	}
 

diff --git a/...src/test/java/org/hibernate/search/test/configuration/bootstrapfailure/BootstrapTest.java b/...src/test/java/org/hibernate/search/test/configuration/bootstrapfailure/BootstrapTest.java
@@ -9,6 +9,7 @@
 import java.util.Set;
 
 import org.hibernate.search.engine.integration.impl.ExtendedSearchIntegrator;
+import org.hibernate.search.spi.impl.PojoIndexedTypeIdentifier;
 import org.hibernate.search.test.SearchTestBase;
 import org.hibernate.search.testsupport.TestForIssue;
 import org.junit.Test;
@@ -36,7 +37,7 @@ public void testCreateIndexSearchEntityWithLobField() {
 				"NoSearchEntity should not have a DocumentBuilderContainedEntity",
 				getExtendedSearchIntegrator()
 				.unwrap( ExtendedSearchIntegrator.class )
-				.getDocumentBuilderContainedEntity( NoSearchEntity.class )
+				.getDocumentBuilderContainedEntity( new PojoIndexedTypeIdentifier( NoSearchEntity.class ) )
 		);
 	}