Currently infinispan-query and infinispan-remote-query-server relies on HS internal code in several places. This is not only limiting us when changing the HS code base but it also is problematic when using HS + ISPN in OSGi.

There are the following references atm:

infinispan-query

• SearchableCacheConfiguration
  • org.hibernate.search.engine.service.classloading.impl.DefaultClassLoaderService (there is a TODO already to replace it with something from ISPN)
• LuceneWorkTransformationVisitor
  • org.hibernate.search.backend.impl.WorkVisitor

infinispan-remote-query-server

• IndexingTagHandler
  • org.hibernate.search.engine.impl.LuceneOptionsImpl
  • org.hibernate.search.engine.metadata.impl.DocumentFieldMetadata
• QueryFacadeImpl
  • org.hibernate.search.bridge.builtin.impl.NullEncodingTwoWayFieldBridge
  • org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeAdaptor

There are also references to the default ConversionContext implementation, but this area is undergoing structural changes anyways as per Sanne Grinovero.