first draft implementation

added new module 'lucene' and 'solr'. Refactoring search services. Issue imixs#554
bvfalcon · Aug 25, 2019 · a7d1def · a7d1def
1 parent c434b9b
commit a7d1def
Show file tree

Hide file tree

Showing 46 changed files with 2,539 additions and 573 deletions.
diff --git a/imixs-workflow-engine/pom.xml b/imixs-workflow-engine/pom.xml
@@ -27,27 +27,7 @@
 			<artifactId>imixs-workflow-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<!-- Apache Lucene -->
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queryparser</artifactId>
-			<version>${lucene.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
+
 		<!-- apache fop dependency -->
 		<dependency>
 			<groupId>org.apache.xmlgraphics</groupId>

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/DocumentService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/DocumentService.java
@@ -58,14 +58,12 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.SortField.Type;
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.WorkflowKernel;
+import org.imixs.workflow.engine.index.SearchService;
+import org.imixs.workflow.engine.index.UpdateService;
+import org.imixs.workflow.engine.index.SortOrder;
 import org.imixs.workflow.engine.jpa.Document;
-import org.imixs.workflow.engine.lucene.LuceneSearchService;
-import org.imixs.workflow.engine.lucene.LuceneUpdateService;
 import org.imixs.workflow.exceptions.AccessDeniedException;
 import org.imixs.workflow.exceptions.InvalidAccessException;
 import org.imixs.workflow.exceptions.QueryException;
@@ -164,11 +162,11 @@ public class DocumentService {
 	@PersistenceContext(unitName = "org.imixs.workflow.jpa")
 	private EntityManager manager;
 
-	@EJB
-	private LuceneUpdateService luceneUpdateService;
+	@Inject
+	private UpdateService indexUpdateService;
 
-	@EJB
-	private LuceneSearchService luceneSearchService;
+	@Inject
+	private SearchService luceneSearchService;
 
 	@Inject
 	protected Event<DocumentEvent> documentEvents;
@@ -475,10 +473,10 @@ public ItemCollection save(ItemCollection document) throws AccessDeniedException
 
 		// add/update document into lucene index
 		if (!document.getItemValueBoolean(NOINDEX)) {
-			luceneUpdateService.updateDocument(document);
+			indexUpdateService.updateDocument(document);
 		} else {
 			// remove from index
-			luceneUpdateService.removeDocument(document.getUniqueID());
+			indexUpdateService.removeDocument(document.getUniqueID());
 		}
 
 		/*
@@ -621,7 +619,7 @@ public void remove(ItemCollection document) throws AccessDeniedException {
 			manager.remove(persistedDocument);
 			// remove document form index - @see issue #412
 			if (!document.getItemValueBoolean(NOINDEX)) {
-				luceneUpdateService.removeDocument(document.getUniqueID());
+				indexUpdateService.removeDocument(document.getUniqueID());
 			}
 
 		} else
@@ -706,7 +704,7 @@ public int countPages(String searchTerm, int pageSize) throws QueryException {
 	 * @return list of ItemCollection elements
 	 * @throws QueryException
 	 * 
-	 * @see org.imixs.workflow.engine.lucene.LuceneSearchService
+	 * @see org.imixs.workflow.engine.index.SearchService
 	 */
 	public List<ItemCollection> find(String searchTerm, int pageSize, int pageIndex) throws QueryException {
 		return find(searchTerm, pageSize, pageIndex, null, false);
@@ -735,20 +733,20 @@ public List<ItemCollection> find(String searchTerm, int pageSize, int pageIndex)
 	 * @return list of ItemCollection elements
 	 * @throws QueryException
 	 * 
-	 * @see org.imixs.workflow.engine.lucene.LuceneSearchService
+	 * @see org.imixs.workflow.engine.index.SearchService
 	 */
 	public List<ItemCollection> find(String searchTerm, int pageSize, int pageIndex, String sortBy, boolean sortReverse)
 			throws QueryException {
 		logger.finest("......find - SearchTerm=" + searchTerm + "  , pageSize=" + pageSize + " pageNumber=" + pageIndex
 				+ " , sortBy=" + sortBy + " reverse=" + sortReverse);
 
 		// create sort object
-		Sort sortOrder = null;
+		SortOrder sortOrder = null;
 		if (sortBy != null && !sortBy.isEmpty()) {
 			// we do not support multi values here - see
 			// LuceneUpdateService.addItemValues
 			// it would be possible if we use a SortedSetSortField class here
-			sortOrder = new Sort(new SortField[] { new SortField(sortBy, Type.STRING, sortReverse) });
+			sortOrder = new SortOrder(sortBy, sortReverse);
 		}
 
 		return luceneSearchService.search(searchTerm, pageSize, pageIndex, sortOrder, null);
@@ -783,20 +781,20 @@ public List<ItemCollection> find(String searchTerm, int pageSize, int pageIndex,
 	 * @return list of ItemCollection elements
 	 * @throws QueryException
 	 * 
-	 * @see org.imixs.workflow.engine.lucene.LuceneSearchService
+	 * @see org.imixs.workflow.engine.index.SearchService
 	 */
 	public List<ItemCollection> findStubs(String searchTerm, int pageSize, int pageIndex, String sortBy,
 			boolean sortReverse) throws QueryException {
 		logger.finest("......find - SearchTerm=" + searchTerm + "  , pageSize=" + pageSize + " pageNumber=" + pageIndex
 				+ " , sortBy=" + sortBy + " reverse=" + sortReverse);
 
 		// create sort object
-		Sort sortOrder = null;
+		SortOrder sortOrder = null;
 		if (sortBy != null && !sortBy.isEmpty()) {
 			// we do not support multi values here - see
 			// LuceneUpdateService.addItemValues
 			// it would be possible if we use a SortedSetSortField class here
-			sortOrder = new Sort(new SortField[] { new SortField(sortBy, Type.STRING, sortReverse) });
+			sortOrder = new SortOrder(sortBy,sortReverse);
 		}
 		// find stubs only!
 		return luceneSearchService.search(searchTerm, pageSize, pageIndex, sortOrder, null, true);

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/EventLogService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/EventLogService.java
@@ -53,7 +53,7 @@
  * type of document entity directly in the database to represent an event. These
  * types of events can be queried by clients through the service.
  * 
- * @see org.imixs.workflow.engine.lucene.LuceneUpdateService
+ * @see org.imixs.workflow.engine.index.UpdateService
  * @author rsoika
  * @version 1.0
  * 

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/ModelService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/ModelService.java
@@ -45,6 +45,7 @@
 import javax.ejb.LocalBean;
 import javax.ejb.SessionContext;
 import javax.ejb.Singleton;
+import javax.inject.Inject;
 
 import org.imixs.workflow.FileData;
 import org.imixs.workflow.ItemCollection;
@@ -89,7 +90,7 @@ public class ModelService implements ModelManager {
 
 	private Map<String, Model> modelStore = null;
 	private static Logger logger = Logger.getLogger(ModelService.class.getName());
-	@EJB
+	@Inject
 	private DocumentService documentService;
 	@Resource
 	private SessionContext ctx;

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/ReportService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/ReportService.java
@@ -50,6 +50,7 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
+import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 import javax.xml.bind.JAXBException;
 import javax.xml.transform.TransformerException;
@@ -93,10 +94,10 @@ public class ReportService {
 
 	private static Logger logger = Logger.getLogger(ReportService.class.getName());
 
-	@EJB
+	@Inject
 	DocumentService documentService;
 
-	@EJB
+	@Inject
 	WorkflowService workflowService;
 
 	/**

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/SetupService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/SetupService.java
@@ -108,13 +108,13 @@ public class SetupService {
 	@ConfigProperty(name = "model.default.data", defaultValue = "")
 	private String modelDefaultData;
 
-	@EJB
+	@Inject
 	private DocumentService documentService;
 
-	@EJB
+	@Inject
 	private ModelService modelService;
 
-	@EJB
+	@Inject
 	private SchedulerService schedulerService;
 
 	@Resource

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/SimulationService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/SimulationService.java
@@ -82,7 +82,7 @@ public class SimulationService implements WorkflowContext {
 	@Any
 	private Instance<Plugin> plugins;
 
-	@EJB
+	@Inject
 	private ModelService modelService;
 
 	public ModelService getModelService() {

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/WorkflowScheduler.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/WorkflowScheduler.java
@@ -13,6 +13,7 @@
 import javax.annotation.Resource;
 import javax.ejb.EJB;
 import javax.ejb.SessionContext;
+import javax.inject.Inject;
 
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.WorkflowKernel;
@@ -43,16 +44,16 @@ public class WorkflowScheduler implements Scheduler {
 
 	private static Logger logger = Logger.getLogger(WorkflowScheduler.class.getName());
 
-	@EJB
+	@Inject
 	private WorkflowService workflowService;
 
-	@EJB
+	@Inject
 	private DocumentService documentService;
 
-	@EJB
+	@Inject
 	private ModelService modelService;
 
-	@EJB
+	@Inject
 	private SchedulerService schedulerService;
 
 	@Resource

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/WorkflowService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/WorkflowService.java
@@ -116,13 +116,13 @@ public class WorkflowService implements WorkflowManager, WorkflowContext {
 	@Any
 	protected Instance<Adapter> adapters;
 
-	@EJB
+	@Inject
 	DocumentService documentService;
 
-	@EJB
+	@Inject
 	ModelService modelService;
 
-	@EJB
+	@Inject
 	ReportService reportService;
 
 	@Resource

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/adminp/AdminPService.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/adminp/AdminPService.java
@@ -92,16 +92,13 @@ public class AdminPService {
 	@Resource
 	javax.ejb.TimerService timerService;
 
-	@EJB
+	@Inject
 	DocumentService documentService;
 
-	@EJB
-	JobHandlerRebuildIndex jobHandlerRebuildIndex;
-
-	@EJB
+	@Inject
 	JobHandlerUpgradeWorkitems jobHandlerUpgradeWorkitems;
 
-	@EJB
+	@Inject
 	JobHandlerRenameUser jobHandlerRenameUser;
 
 
@@ -225,9 +222,6 @@ public void scheduleTimer(javax.ejb.Timer timer) {
 			if (job.equals(JOB_RENAME_USER)) {
 				jobHandler = jobHandlerRenameUser;
 			}
-			if (job.equals(JOB_REBUILD_LUCENE_INDEX)) {
-				jobHandler = jobHandlerRebuildIndex;
-			}
 
 			if (job.equals(JOB_UPGRADE)) {
 				jobHandler = jobHandlerUpgradeWorkitems;

diff --git a/...-workflow-engine/src/main/java/org/imixs/workflow/engine/adminp/JobHandlerRenameUser.java b/...-workflow-engine/src/main/java/org/imixs/workflow/engine/adminp/JobHandlerRenameUser.java
@@ -16,12 +16,13 @@
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.inject.Inject;
 
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.WorkflowKernel;
 import org.imixs.workflow.engine.DocumentService;
 import org.imixs.workflow.engine.WorkflowService;
-import org.imixs.workflow.engine.lucene.LuceneUpdateService;
+import org.imixs.workflow.engine.index.UpdateService;
 import org.imixs.workflow.engine.plugins.OwnerPlugin;
 import org.imixs.workflow.exceptions.AccessDeniedException;
 import org.imixs.workflow.exceptions.InvalidAccessException;
@@ -70,11 +71,11 @@ public class JobHandlerRenameUser implements JobHandler {
 	@Resource
 	SessionContext ctx;
 
-	@EJB
+	@Inject
 	DocumentService documentService;
 
-	@EJB
-	LuceneUpdateService luceneService;
+	@Inject
+	UpdateService luceneService;
 
 	private static final int DEFAULT_COUNT = 100;
 	private static Logger logger = Logger.getLogger(JobHandlerRenameUser.class.getName());

diff --git a/...low-engine/src/main/java/org/imixs/workflow/engine/adminp/JobHandlerUpgradeWorkitems.java b/...low-engine/src/main/java/org/imixs/workflow/engine/adminp/JobHandlerUpgradeWorkitems.java
@@ -15,11 +15,11 @@
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.inject.Inject;
 
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.WorkflowKernel;
 import org.imixs.workflow.engine.DocumentService;
-import org.imixs.workflow.engine.lucene.LuceneSearchService;
 import org.imixs.workflow.engine.plugins.OwnerPlugin;
 import org.imixs.workflow.exceptions.AccessDeniedException;
 import org.imixs.workflow.exceptions.PluginException;
@@ -44,15 +44,10 @@ public class JobHandlerUpgradeWorkitems implements JobHandler {
 	@Resource
 	SessionContext ctx;
 
-	@EJB
+	@Inject
 	DocumentService documentService;
 
-	@EJB
-	LuceneSearchService luceneService;
-
-
-
-	private static Logger logger = Logger.getLogger(JobHandlerRebuildIndex.class.getName());
+	private static Logger logger = Logger.getLogger(JobHandlerUpgradeWorkitems.class.getName());
 
 	/**
 	 * This method runs the RebuildLuceneIndexJob. The AdminP job description
@@ -86,12 +81,6 @@ public ItemCollection run(ItemCollection adminp) throws AdminPException {
 		long lProfiler = System.currentTimeMillis();
 		int iIndex = adminp.getItemValueInteger("numIndex");
 		int iBlockSize = adminp.getItemValueInteger("numBlockSize");
-
-
-		// First flush the lucene event log....
-		logger.info("... flush lucene event log...");
-		luceneService.flush();
-
 
 		// test if numBlockSize is defined.
 		if (iBlockSize <= 0) {
@@ -199,7 +188,7 @@ public boolean upgradeWorkitem(ItemCollection workitem) {
 			workitem.replaceItemValue("$taskid", workitem.getItemValue("$processid"));
 			bUpgrade = true;
 		}
-		
+
 		if (!workitem.hasItem(OwnerPlugin.OWNER)) {
 			workitem.replaceItemValue(OwnerPlugin.OWNER, workitem.getItemValue("namowner"));
 			bUpgrade = true;

diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/index/DefaultOperator.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/index/DefaultOperator.java
@@ -0,0 +1,5 @@
+package org.imixs.workflow.engine.index;
+
+public enum DefaultOperator {
+	OR, AND
+};