ISPN-4562 Upgrade to Hibernate Search 5.0.0.Alpha5

bom/pom.xml

@@ -60,7 +60,7 @@
       <version.antlr>3.4</version.antlr>
       <version.commons.pool>1.6</version.commons.pool>
       <version.gnu.getopt>1.0.13</version.gnu.getopt>
-      <version.hibernate.search>5.0.0.Alpha4</version.hibernate.search>
+      <version.hibernate.search>5.0.0.Alpha5</version.hibernate.search>
       <version.jboss.marshalling>1.4.4.Final</version.jboss.marshalling>
       <version.jboss.logging>3.1.2.GA</version.jboss.logging>
       <version.jgroups>3.5.0.Beta9</version.jgroups>

query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java

@@ -222,13 +222,13 @@ protected void updateIndexes(final boolean usingSkipIndexCleanupFlag, final Obje
 
    private void performSearchWork(Object value, Serializable id, WorkType workType, TransactionContext transactionContext) {
       if (value == null) throw new NullPointerException("Cannot handle a null value!");
-      Collection<Work<Object>> works = searchWorkCreator.createPerEntityWorks(value, id, workType);
+      Collection<Work> works = searchWorkCreator.createPerEntityWorks(value, id, workType);
       performSearchWorks(works, transactionContext);
    }
 
-   private <T> void performSearchWorks(Collection<Work<T>> works, TransactionContext transactionContext) {
+   private void performSearchWorks(Collection<Work> works, TransactionContext transactionContext) {
       Worker worker = searchFactory.getWorker();
-      for (Work<T> work : works) {
+      for (Work work : works) {
          worker.performWork(work, transactionContext);
       }
    }

query/src/main/java/org/infinispan/query/backend/SearchWorkCreator.java

@@ -20,7 +20,7 @@ public interface SearchWorkCreator<T> {
     * @param workType the type of work to be done
     * @return collection of Work instances
     */
-   Collection<Work<T>> createPerEntityTypeWorks(Class<T> entityType, WorkType workType);
+   Collection<Work> createPerEntityTypeWorks(Class<T> entityType, WorkType workType);
 
    /**
     * Creates a collection of Work instances that Hibernate-Search should perform for the given entity
@@ -29,5 +29,5 @@ public interface SearchWorkCreator<T> {
     * @param workType the type of work to be done
     * @return collection of Work instances
     */
-   Collection<Work<T>> createPerEntityWorks(T entity, Serializable id, WorkType workType);
+   Collection<Work> createPerEntityWorks(T entity, Serializable id, WorkType workType);
 }

query/src/main/java/org/infinispan/query/impl/DefaultSearchWorkCreator.java

@@ -14,14 +14,14 @@
 public class DefaultSearchWorkCreator<T> implements SearchWorkCreator<T> {
 
    @Override
-   public Collection<Work<T>> createPerEntityTypeWorks(Class<T> entityType, WorkType workType) {
-      Work<T> work = new Work<T>(entityType, null, workType);
+   public Collection<Work> createPerEntityTypeWorks(Class<T> entityType, WorkType workType) {
+      Work work = new Work(entityType, null, workType);
       return Collections.singleton(work);
    }
 
    @Override
-   public Collection<Work<T>> createPerEntityWorks(T entity, Serializable id, WorkType workType) {
-      Work<T> work = new Work<T>(entity, id, workType);
+   public Collection<Work> createPerEntityWorks(T entity, Serializable id, WorkType workType) {
+      Work work = new Work(entity, id, workType);
       return Collections.singleton(work);
    }
 }