#91 refactorings and Hibernate ORM events implemented

Hotware · Jul 28, 2015 · 9e034e6 · 9e034e6
1 parent 84b83f0
commit 9e034e6
Show file tree

Hide file tree

Showing 19 changed files with 1,161 additions and 144 deletions.
diff --git a/db/src/main/java/org/hibernate/search/genericjpa/db/events/index/impl/IndexUpdater.java b/db/src/main/java/org/hibernate/search/genericjpa/db/events/index/impl/IndexUpdater.java
@@ -141,7 +141,10 @@ public void updateEvent(List<UpdateEventInfo> updateInfos, EntityProvider provid
 												break;
 											}
 											case EventType.DELETE: {
-												IndexUpdater.this.indexWrapper.delete( entityClass, inIndexOf, id, tx );
+												IndexUpdater.this.indexWrapper.delete(
+														entityClass, inIndexOf, id, this.entityProvider,
+														tx
+												);
 												break;
 											}
 											default: {
@@ -195,13 +198,35 @@ public void updateEvent(List<UpdateEventInfo> updateInfos, EntityProvider provid
 
 	}
 
+	public void delete(
+			Class<?> entityClass,
+			List<Class<?>> inIndexOf,
+			Object id,
+			EntityProvider entityProvider,
+			Transaction tx) {
+		this.indexWrapper.delete( entityClass, inIndexOf, id, entityProvider , tx );
+	}
+
+	public void update(Object entity, Transaction tx) {
+		this.indexWrapper.update( entity, tx );
+	}
+
+	public void index(Object entity, Transaction tx) {
+		this.indexWrapper.update( entity, tx );
+	}
+
 	public void close() {
 		this.exec.shutdown();
 	}
 
 	public interface IndexWrapper {
 
-		void delete(Class<?> entityClass, List<Class<?>> inIndexOf, Object id, Transaction tx);
+		void delete(
+				Class<?> entityClass,
+				List<Class<?>> inIndexOf,
+				Object id,
+				EntityProvider entityProvider,
+				Transaction tx);
 
 		void update(Object entity, Transaction tx);
 
@@ -218,7 +243,12 @@ public DefaultIndexWrapper(ExtendedSearchIntegrator searchIntegrator) {
 		}
 
 		@Override
-		public void delete(Class<?> entityClass, List<Class<?>> inIndexOf, Object id, Transaction tx) {
+		public void delete(
+				Class<?> entityClass,
+				List<Class<?>> inIndexOf,
+				Object id,
+				EntityProvider entityProvider,
+				Transaction tx) {
 			for ( Class<?> indexClass : inIndexOf ) {
 				RehashedTypeMetadata metadata = IndexUpdater.this.metadataForIndexRoot.get( indexClass );
 				List<String> fields = metadata.getIdFieldNamesForType().get( entityClass );
@@ -271,7 +301,7 @@ public void delete(Class<?> entityClass, List<Class<?>> inIndexOf, Object id, Tr
 							).maxResults( HSQUERY_BATCH )
 									.queryEntityInfos() ) {
 								Serializable originalId = (Serializable) entityInfo.getProjection()[0];
-								Object original = IndexUpdater.this.entityProvider.get( indexClass, originalId );
+								Object original = entityProvider.get( indexClass, originalId );
 								if ( original != null ) {
 									this.update( original, tx );
 								}

diff --git a/db/src/test/java/org/hibernate/search/genericjpa/test/db/events/IndexUpdaterTest.java b/db/src/test/java/org/hibernate/search/genericjpa/test/db/events/IndexUpdaterTest.java
@@ -26,6 +26,7 @@
 import org.hibernate.search.genericjpa.db.events.UpdateConsumer.UpdateEventInfo;
 import org.hibernate.search.genericjpa.db.events.index.impl.IndexUpdater;
 import org.hibernate.search.genericjpa.db.events.index.impl.IndexUpdater.IndexWrapper;
+import org.hibernate.search.genericjpa.entity.EntityProvider;
 import org.hibernate.search.genericjpa.entity.ReusableEntityProvider;
 import org.hibernate.search.genericjpa.factory.StandaloneSearchConfiguration;
 import org.hibernate.search.genericjpa.factory.Transaction;
@@ -102,7 +103,12 @@ public void testWithoutIndex() {
 		IndexWrapper indexWrapper = new IndexWrapper() {
 
 			@Override
-			public void delete(Class<?> entityClass, List<Class<?>> inIndexOf, Object id, Transaction tx) {
+			public void delete(
+					Class<?> entityClass,
+					List<Class<?>> inIndexOf,
+					Object id,
+					EntityProvider entityProvider,
+					Transaction tx) {
 				Object obj = IndexUpdaterTest.this.obj( entityClass );
 				System.out.println( entityClass );
 				System.out.println( updateInfoSet );

diff --git a/jpa/pom.xml b/jpa/pom.xml
@@ -94,6 +94,13 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+
 		<!-- code gen -->
 		<dependency>
 			<groupId>com.squareup</groupId>
@@ -105,7 +112,6 @@
 			<artifactId>javaee-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/jpa/src/main/java/org/hibernate/search/genericjpa/Setup.java b/jpa/src/main/java/org/hibernate/search/genericjpa/Setup.java
@@ -19,6 +19,7 @@
 import org.hibernate.search.genericjpa.annotations.CustomUpdateEntityProvider;
 import org.hibernate.search.genericjpa.annotations.InIndex;
 import org.hibernate.search.genericjpa.db.events.eclipselink.impl.EclipseLinkSynchronizedUpdateSourceProvider;
+import org.hibernate.search.genericjpa.db.events.hibernate.impl.HibernateSynchronizedUpdateSourceProvider;
 import org.hibernate.search.genericjpa.db.events.triggers.TriggerSQLStringSource;
 import org.hibernate.search.genericjpa.entity.EntityManagerEntityProvider;
 import org.hibernate.search.genericjpa.exception.SearchException;
@@ -178,6 +179,9 @@ else if ( "manual-updates".equals( type ) ) {
 			else if ( "eclipselink".equals( type ) ) {
 				synchronizedUpdateSourceProvider = new EclipseLinkSynchronizedUpdateSourceProvider();
 			}
+			else if ( "hibernate".equals( type ) ) {
+				synchronizedUpdateSourceProvider = new HibernateSynchronizedUpdateSourceProvider();
+			}
 			else {
 				throw new SearchException( "unrecognized " + SEARCH_FACTORY_TYPE_KEY + ": " + type );
 			}

diff --git a/...g/hibernate/search/genericjpa/db/events/eclipselink/impl/DummyReusableEntityProvider.java b/...g/hibernate/search/genericjpa/db/events/eclipselink/impl/DummyReusableEntityProvider.java
@@ -0,0 +1,34 @@
+package org.hibernate.search.genericjpa.db.events.eclipselink.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.AssertionFailure;
+import org.hibernate.search.genericjpa.entity.ReusableEntityProvider;
+
+/**
+ * Created by Martin on 28.07.2015.
+ */
+public class DummyReusableEntityProvider implements ReusableEntityProvider {
+
+	@Override
+	public void close() {
+		throw new AssertionFailure( "should not have been used" );
+	}
+
+	@Override
+	public void open() {
+		throw new AssertionFailure( "should not have been used" );
+	}
+
+	@Override
+	public Object get(Class<?> entityClass, Object id, Map<String, String> hints) {
+		throw new AssertionFailure( "should not have been used" );
+	}
+
+	@Override
+	public List getBatch(Class<?> entityClass, List<Object> id, Map<String, String> hints) {
+		throw new AssertionFailure( "should not have been used" );
+	}
+
+}
diff --git a/...ch/genericjpa/db/events/eclipselink/impl/EclipseLinkSynchronizedUpdateSourceProvider.java b/...ch/genericjpa/db/events/eclipselink/impl/EclipseLinkSynchronizedUpdateSourceProvider.java
@@ -16,8 +16,12 @@
 import org.eclipse.persistence.jpa.JpaEntityManager;
 import org.eclipse.persistence.sessions.Session;
 
+import org.hibernate.search.engine.integration.impl.ExtendedSearchIntegrator;
 import org.hibernate.search.genericjpa.JPASearchFactoryController;
+import org.hibernate.search.genericjpa.db.events.index.impl.IndexUpdater;
+import org.hibernate.search.genericjpa.entity.ReusableEntityProvider;
 import org.hibernate.search.genericjpa.events.impl.SynchronizedUpdateSource;
+import org.hibernate.search.genericjpa.impl.JPASearchFactoryAdapter;
 import org.hibernate.search.genericjpa.impl.SynchronizedUpdateSourceProvider;
 import org.hibernate.search.genericjpa.metadata.impl.RehashedTypeMetadata;
 
@@ -28,7 +32,7 @@ public class EclipseLinkSynchronizedUpdateSourceProvider implements Synchronized
 
 	@Override
 	public SynchronizedUpdateSource getUpdateSource(
-			JPASearchFactoryController searchFactoryController,
+			ExtendedSearchIntegrator searchIntegrator,
 			Map<Class<?>, RehashedTypeMetadata> rehashedTypeMetadataPerIndexRoot,
 			Map<Class<?>, List<Class<?>>> containedInIndexOf,
 			Properties properties,
@@ -39,8 +43,15 @@ public SynchronizedUpdateSource getUpdateSource(
 		try {
 			Session session = entityManager.getServerSession();
 
+			IndexUpdater indexUpdater = new IndexUpdater(
+					rehashedTypeMetadataPerIndexRoot,
+					containedInIndexOf,
+					new DummyReusableEntityProvider(),
+					searchIntegrator
+			);
+
 			EclipseLinkUpdateSource eclipseLinkUpdateSource = new EclipseLinkUpdateSource(
-					searchFactoryController,
+					indexUpdater,
 					indexRelevantEntities,
 					rehashedTypeMetadataPerIndexRoot,
 					containedInIndexOf