Implements UI for jaeksoft#1548

src/main/java/com/jaeksoft/searchlib/analysis/filter/IndexLookupFilter.java

@@ -46,7 +46,7 @@
 import com.jaeksoft.searchlib.analysis.TokenTerm;
 import com.jaeksoft.searchlib.function.expression.SyntaxError;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.result.AbstractResultSearch;
 import com.jaeksoft.searchlib.result.ResultDocument;
 import com.jaeksoft.searchlib.schema.FieldValueItem;
@@ -104,7 +104,7 @@ public void setProperties(String indexName, String requestName,
 	public TokenStream create(TokenStream tokenStream)
 			throws SearchLibException {
 		Client indexClient = ClientCatalog.getClient(indexName);
-		AbstractSearchRequest searchRequest = (AbstractSearchRequest) indexClient
+		AbstractLocalSearchRequest searchRequest = (AbstractLocalSearchRequest) indexClient
 				.getNewRequest(requestName);
 		searchRequest.setDefaultOperator("OR");
 		return new IndexLookupTokenFilter(tokenStream, indexClient,
@@ -114,7 +114,7 @@ public TokenStream create(TokenStream tokenStream)
 	public static class IndexLookupTokenFilter extends AbstractTermFilter {
 
 		private final Client indexClient;
-		private final AbstractSearchRequest searchRequest;
+		private final AbstractLocalSearchRequest searchRequest;
 		private final String[] returnFields;
 		private final String requestedField;
 
@@ -124,8 +124,8 @@ public static class IndexLookupTokenFilter extends AbstractTermFilter {
 		private int currentQueuePos;
 
 		public IndexLookupTokenFilter(TokenStream input, Client indexClient,
-				AbstractSearchRequest searchRequest, String requestedField,
-				String returnField, int batchBuffer) {
+				AbstractLocalSearchRequest searchRequest,
+				String requestedField, String returnField, int batchBuffer) {
 			super(input);
 			tokenQueue = new ArrayList<TokenTerm>(0);
 			this.batchBuffer = batchBuffer;
@@ -169,7 +169,7 @@ private final void searchTokens() throws SearchLibException,
 						Occur.SHOULD);
 			searchRequest.setBoostedComplexQuery(bq);
 			searchRequest.setRows(collectedTokenBuffer.size());
-			AbstractResultSearch result = (AbstractResultSearch) indexClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) indexClient
 					.request(searchRequest);
 			collectedTokenBuffer.clear();
 			if (result.getNumFound() == 0)

src/main/java/com/jaeksoft/searchlib/autocompletion/AutoCompletionBuildThread.java

@@ -144,7 +144,7 @@ private int buildSearchRequest(List<IndexDocument> buffer, int docCount)
 					+ " is not a Search request ");
 		AbstractSearchRequest searchRequest = (AbstractSearchRequest) request;
 		searchRequest.setRows(0);
-		AbstractResultSearch result = (AbstractResultSearch) sourceClient
+		AbstractResultSearch<?> result = (AbstractResultSearch<?>) sourceClient
 				.request(request);
 		if (result == null)
 			return docCount;

src/main/java/com/jaeksoft/searchlib/autocompletion/AutoCompletionItem.java

@@ -303,7 +303,7 @@ public int build(Integer waitForEndTimeOut, int bufferSize,
 		}
 	}
 
-	public AbstractResultSearch search(String query, Integer rows)
+	public AbstractResultSearch<?> search(String query, Integer rows)
 			throws SearchLibException {
 		rwl.r.lock();
 		try {
@@ -316,7 +316,8 @@ public AbstractResultSearch search(String query, Integer rows)
 			query = QueryUtils.replaceControlChars(query.replace("\"", ""));
 			searchRequest.setQueryString(query);
 			searchRequest.setRows(rows);
-			return (AbstractResultSearch) autoCompClient.request(searchRequest);
+			return (AbstractResultSearch<?>) autoCompClient
+					.request(searchRequest);
 		} finally {
 			rwl.r.unlock();
 		}

src/main/java/com/jaeksoft/searchlib/classifier/ClassifierItem.java

@@ -221,7 +221,7 @@ public int query(Client client, LanguageEnum lang)
 			throws SearchLibException {
 		AbstractSearchRequest searchRequest = getSearchRequest(client, lang);
 		searchRequest.setRows(0);
-		return ((AbstractResultSearch) client.request(searchRequest))
+		return ((AbstractResultSearch<?>) client.request(searchRequest))
 				.getNumFound();
 	}
 

src/main/java/com/jaeksoft/searchlib/crawler/common/database/AbstractManager.java

@@ -214,7 +214,7 @@ protected long synchronizeIndex(AbstractSearchRequest searchRequest,
 			joinItem.setLocalField(targetField);
 			joinItem.setOuterCollector(outerCollector);
 			searchRequest.getJoinList().add(joinItem);
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(searchRequest);
 			outerCollector.delete();
 			if (taskLog != null) {

src/main/java/com/jaeksoft/searchlib/crawler/file/database/FileManager.java

@@ -218,7 +218,7 @@ public FileInfo getFileInfo(String uriString) throws SearchLibException,
 		searchRequest.setQueryString(sb.toString());
 		searchRequest.setStart(0);
 		searchRequest.setRows(1);
-		AbstractResultSearch result = (AbstractResultSearch) dbClient
+		AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 				.request(searchRequest);
 		if (result.getNumFound() == 0)
 			return null;
@@ -237,7 +237,7 @@ public void getFileInfoList(URI parentDirectory,
 		searchRequest.setQueryString(sb.toString());
 		searchRequest.setStart(0);
 		searchRequest.setRows(Integer.MAX_VALUE);
-		AbstractResultSearch result = (AbstractResultSearch) dbClient
+		AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 				.request(searchRequest);
 		int l = result.getNumFound();
 		for (int i = 0; i < l; i++) {
@@ -252,7 +252,7 @@ public long getFileList(AbstractSearchRequest searchRequest, long start,
 		searchRequest.setStart((int) start);
 		searchRequest.setRows((int) rows);
 		try {
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(searchRequest);
 			if (list != null)
 				for (ResultDocument doc : result)
@@ -285,7 +285,7 @@ public long getFiles(AbstractSearchRequest searchRequest,
 		try {
 			if (orderBy != null)
 				orderBy.addSort(searchRequest, !orderAsc);
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(searchRequest);
 			if (list != null)
 				for (ResultDocument doc : result)

src/main/java/com/jaeksoft/searchlib/crawler/mailbox/MailboxCrawlThread.java

@@ -274,7 +274,7 @@ public boolean isAlreadyIndexed(String messageId) throws SearchLibException {
 			return false;
 		uniqueSearchRequest.reset();
 		uniqueSearchRequest.setQueryString(value);
-		AbstractResultSearch result = (AbstractResultSearch) client
+		AbstractResultSearch<?> result = (AbstractResultSearch<?>) client
 				.request(uniqueSearchRequest);
 		return result.getNumFound() > 0;
 	}

src/main/java/com/jaeksoft/searchlib/crawler/web/database/UrlManager.java

@@ -206,7 +206,7 @@ private int getFacetLimit(ItemField field,
 			int maxUrlPerHost, NamedItem.Selection selection,
 			List<NamedItem> list, Set<String> hostSet)
 			throws SearchLibException {
-		AbstractResultSearch result = (AbstractResultSearch) dbClient
+		AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 				.request(searchRequest);
 		List<FacetItem> facetItems = result.getFacetList()
 				.getByField(field.getName()).getList();
@@ -316,7 +316,7 @@ public void getUrlToFetch(NamedItem host, long urlLimit,
 			throw new SearchLibException(e);
 		}
 		searchRequest.setRows((int) urlLimit);
-		AbstractResultSearch result = (AbstractResultSearch) dbClient
+		AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 				.request(searchRequest);
 		for (ResultDocument item : result)
 			urlList.add(getNewUrlItem(item));
@@ -346,7 +346,7 @@ public int countBackLinks(String url) throws SearchLibException {
 					searchRequest, ParserStatus.PARSED.value, false, false);
 			searchRequest.setQueryString(sb.toString());
 			searchRequest.setRows(0);
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(searchRequest);
 			return result.getNumFound();
 		} catch (ParseException e) {
@@ -508,7 +508,7 @@ private UrlItem getUrl(AbstractSearchRequest request, String sUrl)
 		request.setStart(0);
 		request.setRows(1);
 		try {
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(request);
 			for (ResultDocument doc : result)
 				return getNewUrlItem(doc);
@@ -524,7 +524,7 @@ public long getUrlList(AbstractSearchRequest searchRequest, long start,
 		searchRequest.setStart((int) start);
 		searchRequest.setRows((int) rows);
 		try {
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(searchRequest);
 			if (list != null)
 				for (ResultDocument doc : result)
@@ -545,7 +545,7 @@ public Facet getHostFacetList(int minCount) throws SearchLibException {
 			if (minCount < 0)
 				minCount = 0;
 			facetField.setMinCount(minCount);
-			AbstractResultSearch result = (AbstractResultSearch) dbClient
+			AbstractResultSearch<?> result = (AbstractResultSearch<?>) dbClient
 					.request(searchRequest);
 			if (result == null)
 				return null;

src/main/java/com/jaeksoft/searchlib/filter/AuthFilter.java

@@ -39,6 +39,7 @@
 import com.jaeksoft.searchlib.SearchLibException;
 import com.jaeksoft.searchlib.authentication.AuthManager;
 import com.jaeksoft.searchlib.query.ParseException;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.request.AbstractSearchRequest;
 import com.jaeksoft.searchlib.schema.SchemaField;
 import com.jaeksoft.searchlib.util.Timer;
@@ -65,7 +66,7 @@ public void writeXmlConfig(XmlWriter xmlWriter) throws SAXException {
 
 	@Override
 	final public String getCacheKey(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request)
+			Analyzer analyzer, AbstractLocalSearchRequest request)
 			throws ParseException {
 		StringBuilder sb = new StringBuilder(getDescription());
 		sb.append(" - ");
@@ -134,7 +135,7 @@ private Query getQuery(AbstractSearchRequest request, AuthManager auth)
 
 	@Override
 	public FilterHits getFilterHits(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request, Timer timer)
+			Analyzer analyzer, AbstractLocalSearchRequest request, Timer timer)
 			throws ParseException, IOException, SearchLibException {
 		AuthManager auth = request.getConfig().getAuthManager();
 		Query query = getQuery(request, auth);

src/main/java/com/jaeksoft/searchlib/filter/FilterAbstract.java

@@ -35,7 +35,7 @@
 import com.jaeksoft.searchlib.function.expression.SyntaxError;
 import com.jaeksoft.searchlib.geo.GeoParameters;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.request.SearchFilterRequest;
 import com.jaeksoft.searchlib.result.ResultSearchSingle;
 import com.jaeksoft.searchlib.schema.SchemaField;
@@ -151,11 +151,11 @@ public String getParamPosition() {
 	public abstract String getDescription();
 
 	public abstract String getCacheKey(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request)
+			Analyzer analyzer, AbstractLocalSearchRequest request)
 			throws ParseException, SyntaxError, SearchLibException, IOException;
 
 	public abstract FilterHits getFilterHits(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request, Timer timer)
+			Analyzer analyzer, AbstractLocalSearchRequest request, Timer timer)
 			throws ParseException, IOException, SearchLibException, SyntaxError;
 
 	public abstract void writeXmlConfig(XmlWriter xmlWriter)

src/main/java/com/jaeksoft/searchlib/filter/FilterListExecutor.java

@@ -33,7 +33,7 @@
 import com.jaeksoft.searchlib.config.Config;
 import com.jaeksoft.searchlib.function.expression.SyntaxError;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.schema.Schema;
 import com.jaeksoft.searchlib.schema.SchemaField;
 import com.jaeksoft.searchlib.util.ExceptionUtils;
@@ -47,14 +47,15 @@ public class FilterListExecutor {
 	private final ThreadGroup threadGroup;
 	private final SchemaField defaultField;
 	private final PerFieldAnalyzer analyzer;
-	private final AbstractSearchRequest request;
+	private final AbstractLocalSearchRequest request;
 	private final OperatorEnum defaultOperator;
 	private final Timer timer;
 	private final FilterHits finalFilterHits;
 	private final List<FilterThread> threads;
 
-	public FilterListExecutor(AbstractSearchRequest searchRequest, Timer timer)
-			throws SearchLibException, ParseException, IOException, SyntaxError {
+	public FilterListExecutor(AbstractLocalSearchRequest searchRequest,
+			Timer timer) throws SearchLibException, ParseException,
+			IOException, SyntaxError {
 		Config config = searchRequest.getConfig();
 		Schema schema = config.getSchema();
 		defaultField = schema.getFieldList().getDefaultField();

src/main/java/com/jaeksoft/searchlib/filter/GeoFilter.java

@@ -41,7 +41,7 @@
 import com.jaeksoft.searchlib.analysis.filter.DegreesRadiansFilter;
 import com.jaeksoft.searchlib.geo.GeoParameters;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.result.ResultSearchSingle;
 import com.jaeksoft.searchlib.result.collector.DistanceInterface;
 import com.jaeksoft.searchlib.result.collector.DocIdInterface;
@@ -215,7 +215,7 @@ public void writeXmlConfig(XmlWriter xmlWriter) throws SAXException {
 
 	@Override
 	public String getCacheKey(SchemaField defaultField, Analyzer analyzer,
-			AbstractSearchRequest request) throws ParseException {
+			AbstractLocalSearchRequest request) throws ParseException {
 		StringBuilder sb = new StringBuilder("GeoFilter - ");
 		sb.append(getQuery(request.getGeoParameters()).toString());
 		sb.append(" - ");
@@ -284,8 +284,8 @@ public static void main(String[] args) {
 
 	@Override
 	public FilterHits getFilterHits(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest searchRequest, Timer timer)
-			throws ParseException, IOException, SearchLibException {
+			Analyzer analyzer, AbstractLocalSearchRequest searchRequest,
+			Timer timer) throws ParseException, IOException, SearchLibException {
 		GeoParameters geoParams = searchRequest.getGeoParameters();
 		Query query = getQuery(geoParams);
 		ResultSearchSingle result = getResult(searchRequest.getConfig(), query,

src/main/java/com/jaeksoft/searchlib/filter/MirrorAndFilter.java

@@ -34,7 +34,7 @@
 import com.jaeksoft.searchlib.SearchLibException;
 import com.jaeksoft.searchlib.function.expression.SyntaxError;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.schema.SchemaField;
 import com.jaeksoft.searchlib.util.Timer;
 import com.jaeksoft.searchlib.util.XPathParser;
@@ -74,19 +74,19 @@ public void writeXmlConfig(XmlWriter xmlWriter) throws SAXException {
 
 	@Override
 	public String getCacheKey(SchemaField defaultField, Analyzer analyzer,
-			AbstractSearchRequest request) throws ParseException, SyntaxError,
-			SearchLibException, IOException {
+			AbstractLocalSearchRequest request) throws ParseException,
+			SyntaxError, SearchLibException, IOException {
 		StringBuilder sb = new StringBuilder("MirrorAndFilter - ");
 		sb.append(getQuery(request).toString());
 		return sb.toString();
 	}
 
-	private Query getQuery(AbstractSearchRequest request)
+	private Query getQuery(AbstractLocalSearchRequest request)
 			throws ParseException, SyntaxError, SearchLibException, IOException {
 		if (query != null)
 			return query;
 		try {
-			request = (AbstractSearchRequest) request.duplicate();
+			request = (AbstractLocalSearchRequest) request.duplicate();
 			request.setDefaultOperator(OperatorEnum.AND);
 			query = request.getNotBoostedQuery();
 			return query;
@@ -99,7 +99,7 @@ private Query getQuery(AbstractSearchRequest request)
 
 	@Override
 	public FilterHits getFilterHits(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request, Timer timer)
+			Analyzer analyzer, AbstractLocalSearchRequest request, Timer timer)
 			throws ParseException, IOException, SearchLibException, SyntaxError {
 		Query query = getQuery(request);
 		return new FilterHits(

src/main/java/com/jaeksoft/searchlib/filter/QueryFilter.java

@@ -37,7 +37,7 @@
 
 import com.jaeksoft.searchlib.SearchLibException;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.schema.SchemaField;
 import com.jaeksoft.searchlib.util.StringUtils;
 import com.jaeksoft.searchlib.util.Timer;
@@ -102,7 +102,7 @@ public String getDescription() {
 
 	@Override
 	public String getCacheKey(SchemaField defaultField, Analyzer analyzer,
-			AbstractSearchRequest request) throws ParseException {
+			AbstractLocalSearchRequest request) throws ParseException {
 		return "QueryFilter - " + getQuery(defaultField, analyzer).toString();
 	}
 
@@ -116,7 +116,7 @@ public void writeXmlConfig(XmlWriter xmlWriter) throws SAXException {
 
 	@Override
 	public FilterHits getFilterHits(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request, Timer timer)
+			Analyzer analyzer, AbstractLocalSearchRequest request, Timer timer)
 			throws ParseException, IOException, SearchLibException {
 		Query query = getQuery(defaultField, analyzer);
 		return new FilterHits(

src/main/java/com/jaeksoft/searchlib/filter/RelativeDateFilter.java

@@ -39,7 +39,7 @@
 import com.jaeksoft.searchlib.SearchLibException;
 import com.jaeksoft.searchlib.crawler.common.database.TimeInterval;
 import com.jaeksoft.searchlib.query.ParseException;
-import com.jaeksoft.searchlib.request.AbstractSearchRequest;
+import com.jaeksoft.searchlib.request.AbstractLocalSearchRequest;
 import com.jaeksoft.searchlib.schema.SchemaField;
 import com.jaeksoft.searchlib.util.DomUtils;
 import com.jaeksoft.searchlib.util.Timer;
@@ -139,7 +139,7 @@ public String getDescription() {
 
 	@Override
 	public String getCacheKey(SchemaField defaultField, Analyzer analyzer,
-			AbstractSearchRequest request) throws ParseException {
+			AbstractLocalSearchRequest request) throws ParseException {
 		return "QueryFilter - " + getQuery(defaultField, analyzer).toString();
 	}
 
@@ -153,7 +153,7 @@ public void writeXmlConfig(XmlWriter xmlWriter) throws SAXException {
 
 	@Override
 	public FilterHits getFilterHits(SchemaField defaultField,
-			Analyzer analyzer, AbstractSearchRequest request, Timer timer)
+			Analyzer analyzer, AbstractLocalSearchRequest request, Timer timer)
 			throws ParseException, IOException, SearchLibException {
 		Query query = getQuery(defaultField, analyzer);
 		return new FilterHits(