From f9dd6dfa12a72c38b4048288b433f541afee4361 Mon Sep 17 00:00:00 2001 From: Angel Borroy <48685308+aborroy@users.noreply.github.com> Date: Wed, 4 Nov 2020 12:12:50 +0100 Subject: [PATCH] Merge pull request #995 from Alfresco/fix/SEARCH-2537_DataModelSupport MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SEARCH-2537: Update alfresco-search and insight-engine with some chan… (cherry picked from commit 853ff944d8c50f8d0b145766e5b3fadf53d4c027) --- .../solr/AlfrescoCoreAdminHandler.java | 4 +- .../alfresco/solr/AlfrescoSolrDataModel.java | 10 +- .../main/java/org/alfresco/solr/Cloud.java | 2 +- .../alfresco/solr/SolrInformationServer.java | 98 +++++++++---------- .../solr/component/FingerPrintComponent.java | 2 +- .../solr/query/AbstractAuthoritySetQuery.java | 2 +- .../alfresco/solr/query/AbstractQParser.java | 2 +- .../Lucene4QueryBuilderContextSolrImpl.java | 10 +- .../solr/query/Lucene4QueryParserAdaptor.java | 18 ++-- .../alfresco/solr/query/Solr4QueryParser.java | 6 +- .../solr/query/SolrAuthorityQuery.java | 2 +- .../solr/query/SolrAuthoritySetQuery.java | 2 +- .../alfresco/solr/query/SolrDeniedQuery.java | 2 +- .../alfresco/solr/query/SolrDeniedScorer.java | 2 +- .../alfresco/solr/query/SolrDenySetQuery.java | 2 +- .../solr/query/SolrDenySetScorer.java | 2 +- .../solr/query/SolrDenySetScorer2.java | 2 +- .../alfresco/solr/query/SolrOwnerQuery.java | 2 +- .../alfresco/solr/query/SolrOwnerScorer.java | 2 +- .../solr/query/SolrOwnerSetQuery.java | 2 +- .../solr/query/SolrOwnerSetScorer.java | 2 +- .../alfresco/solr/query/SolrReaderQuery.java | 2 +- .../alfresco/solr/query/SolrReaderScorer.java | 2 +- .../solr/query/SolrReaderSetQuery.java | 2 +- .../solr/query/SolrReaderSetScorer.java | 2 +- .../solr/query/SolrReaderSetScorer2.java | 2 +- .../impl/lucene/analysis/MLAnalayserTest.java | 1 - .../solr/AbstractAlfrescoDistributedIT.java | 2 +- .../org/alfresco/solr/AlfrescoSolrUtils.java | 60 ++++++------ .../solr/SolrInformationServerTest.java | 2 +- .../AlfrescoHighligherDistributedIT.java | 2 +- .../solr/highlight/AlfrescoHighlighterIT.java | 2 +- .../solr/query/AlfrescoSolrFingerprintIT.java | 2 +- .../org/alfresco/solr/query/AuthQueryIT.java | 2 +- .../DistributedAlfrescoSolrFingerPrintIT.java | 2 +- .../org/alfresco/solr/query/SolrAuthIT.java | 2 +- .../afts/qparser/FieldNameEscapingIT.java | 2 +- .../query/afts/qparser/QParserPluginIT.java | 2 +- .../requestHandler/AFTSRequestHandlerIT.java | 2 +- .../cmis/AlfrescoCMISQParserPluginIT.java | 2 +- .../AlfrescoSolrTrackerExceptionIT.java | 2 +- .../solr/tracker/AlfrescoSolrTrackerIT.java | 2 +- .../AlfrescoSolrTrackerRollbackIT.java | 2 +- .../tracker/AlfrescoSolrTrackerStateIT.java | 2 +- .../alfresco/solr/tracker/CascadingIT.java | 2 +- ...DistributedAclIdAlfrescoSolrTrackerIT.java | 2 +- .../DistributedAlfrescoSolrJsonIT.java | 2 +- .../DistributedAlfrescoSolrTrackerIT.java | 2 +- ...ibutedAlfrescoSolrTrackerLargeTxnIdIT.java | 2 +- .../DistributedAlfrescoSolrTrackerRaceIT.java | 2 +- ...DistributedAlfrescoSolrTrackerStateIT.java | 2 +- ...rescoTrackerWithDelayedTransactionsIT.java | 2 +- ...ributedDateMonthAlfrescoSolrTrackerIT.java | 2 +- ...ributedDbidRangeAlfrescoSolrTrackerIT.java | 2 +- ...dExpandDbidRangeAlfrescoSolrTrackerIT.java | 6 +- ...tributedExplicitShardRoutingTrackerIT.java | 2 +- ...tedPropertyBasedAlfrescoSolrTrackerIT.java | 2 +- .../AlfrescoFieldMapperTransformerIT.java | 2 +- .../alfresco-solrclient-lib/pom.xml | 4 +- .../solr/client/SOLRAPIClientTest.java | 2 - .../src/main/resources/licenses/notice.txt | 24 ++--- 61 files changed, 169 insertions(+), 172 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java index ffad446ac..57c46ba39 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java @@ -89,8 +89,8 @@ import static java.util.Arrays.asList; import static java.util.Arrays.stream; import static java.util.Optional.of; import static java.util.Optional.ofNullable; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_INACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_INTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_INACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_INTXID; import static org.alfresco.solr.HandlerOfResources.extractCustomProperties; import static org.alfresco.solr.HandlerOfResources.getSafeBoolean; import static org.alfresco.solr.HandlerOfResources.getSafeLong; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java index 5c9028550..d8c4a7cd3 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java @@ -67,7 +67,7 @@ import org.alfresco.repo.dictionary.M2ModelDiff; import org.alfresco.repo.dictionary.NamespaceDAO; import org.alfresco.repo.i18n.StaticMessageLookup; import org.alfresco.repo.search.MLAnalysisMode; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.repo.search.impl.QueryParserUtils; import org.alfresco.repo.search.impl.parsers.AlfrescoFunctionEvaluationContext; import org.alfresco.repo.search.impl.parsers.FTSParser; @@ -76,8 +76,8 @@ import org.alfresco.repo.search.impl.querymodel.Constraint; import org.alfresco.repo.search.impl.querymodel.QueryModelFactory; import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective; import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilder; -import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext; import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryModelFactory; +import org.alfresco.repo.search.impl.querymodel.impl.lucene.QueryBuilderContext; import org.alfresco.repo.tenant.SingleTServiceImpl; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; @@ -1537,7 +1537,7 @@ public class AlfrescoSolrDataModel implements QueryConstants Set selectorGroup = queryModelQuery.getSource().getSelectorGroups(functionContext).get(0); - LuceneQueryBuilderContext luceneContext = getLuceneQueryBuilderContext(searchParameters, req, alternativeDictionary, FTSQueryParser.RerankPhase.SINGLE_PASS); + QueryBuilderContext luceneContext = getLuceneQueryBuilderContext(searchParameters, req, alternativeDictionary, FTSQueryParser.RerankPhase.SINGLE_PASS); @SuppressWarnings("unchecked") LuceneQueryBuilder builder = (LuceneQueryBuilder) queryModelQuery; org.apache.lucene.search.Query luceneQuery = builder.buildQuery(selectorGroup, luceneContext, functionContext); @@ -1545,7 +1545,7 @@ public class AlfrescoSolrDataModel implements QueryConstants return new ContextAwareQuery(luceneQuery, Boolean.TRUE.equals(isFilter) ? null : searchParameters); } - public LuceneQueryBuilderContext getLuceneQueryBuilderContext(SearchParameters searchParameters, SolrQueryRequest req, String alternativeDictionary, FTSQueryParser.RerankPhase rerankPhase) + public QueryBuilderContext getLuceneQueryBuilderContext(SearchParameters searchParameters, SolrQueryRequest req, String alternativeDictionary, FTSQueryParser.RerankPhase rerankPhase) { return new Lucene4QueryBuilderContextSolrImpl( getDictionaryService(alternativeDictionary), @@ -1603,7 +1603,7 @@ public class AlfrescoSolrDataModel implements QueryConstants @SuppressWarnings("unchecked") LuceneQueryBuilder builder = (LuceneQueryBuilder) queryModelQuery; - LuceneQueryBuilderContext luceneContext = getLuceneQueryBuilderContext(searchParameters, req, CMISStrictDictionaryService.DEFAULT, rerankPhase); + QueryBuilderContext luceneContext = getLuceneQueryBuilderContext(searchParameters, req, CMISStrictDictionaryService.DEFAULT, rerankPhase); Set selectorGroup = null; if (queryModelQuery.getSource() != null) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/Cloud.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/Cloud.java index 27ddf4314..37882dd0b 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/Cloud.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/Cloud.java @@ -28,7 +28,7 @@ package org.alfresco.solr; import java.util.Collection; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java index 15325426d..298bd9ea5 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java @@ -30,54 +30,54 @@ import static java.util.Arrays.asList; import static java.util.Arrays.stream; import static java.util.Optional.empty; import static java.util.Optional.ofNullable; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ACLID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ACLTXCOMMITTIME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ANAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ANCESTOR; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_APATH; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ASPECT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ASSOCTYPEQNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_CASCADE_FLAG; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DBID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DENIED; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_EXCEPTION_MESSAGE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_EXCEPTION_STACK; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_FIELDS; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_GEO; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_INACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_INTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ISNODE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_LID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_NPATH; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_NULLPROPERTIES; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_OWNER; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PARENT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PARENT_ASSOC_CRC; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PATH; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PRIMARYASSOCQNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PRIMARYASSOCTYPEQNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PRIMARYPARENT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PROPERTIES; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_QNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_READER; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_SITE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_SOLR4_ID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_S_ACLTXCOMMITTIME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_S_ACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_S_INACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_S_INTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_S_TXCOMMITTIME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_S_TXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TAG; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TAG_SUGGEST; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TENANT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXCOMMITTIME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TYPE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_VERSION; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ACLID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ACLTXCOMMITTIME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ANAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ANCESTOR; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_APATH; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ASPECT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ASSOCTYPEQNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_CASCADE_FLAG; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DBID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DENIED; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_EXCEPTION_MESSAGE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_EXCEPTION_STACK; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_FIELDS; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_GEO; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_INACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_INTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ISNODE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_LID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_NPATH; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_NULLPROPERTIES; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_OWNER; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PARENT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PARENT_ASSOC_CRC; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PATH; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PRIMARYASSOCQNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PRIMARYASSOCTYPEQNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PRIMARYPARENT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PROPERTIES; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_QNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_READER; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_SITE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_SOLR4_ID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_S_ACLTXCOMMITTIME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_S_ACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_S_INACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_S_INTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_S_TXCOMMITTIME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_S_TXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TAG; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TAG_SUGGEST; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TENANT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TXCOMMITTIME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_VERSION; import static org.alfresco.solr.AlfrescoSolrDataModel.getAclChangeSetDocumentId; import static org.alfresco.solr.AlfrescoSolrDataModel.getAclDocumentId; import static org.alfresco.solr.utils.Utils.notNullOrEmpty; @@ -132,7 +132,7 @@ import org.alfresco.opencmis.dictionary.CMISStrictDictionaryService; import org.alfresco.repo.dictionary.DictionaryComponent; import org.alfresco.repo.dictionary.M2Model; import org.alfresco.repo.dictionary.NamespaceDAO; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java index 023e88d9e..e96f7ad16 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java @@ -26,7 +26,7 @@ package org.alfresco.solr.component; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_LID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_LID; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractAuthoritySetQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractAuthoritySetQuery.java index 9bf0c98ee..65da0c144 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractAuthoritySetQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractAuthoritySetQuery.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractQParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractQParser.java index e3fd8b0b5..68e6cea4b 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractQParser.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractQParser.java @@ -40,7 +40,7 @@ import java.util.Locale; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.search.MLAnalysisMode; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.search.QueryConsistency; import org.alfresco.service.cmr.search.SearchParameters; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryBuilderContextSolrImpl.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryBuilderContextSolrImpl.java index 5c5758065..f67c0a111 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryBuilderContextSolrImpl.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryBuilderContextSolrImpl.java @@ -29,9 +29,9 @@ package org.alfresco.solr.query; import java.util.Properties; import org.alfresco.repo.search.MLAnalysisMode; -import org.alfresco.repo.search.adaptor.lucene.LuceneQueryParserAdaptor; +import org.alfresco.repo.search.adaptor.QueryParserAdaptor; import org.alfresco.repo.search.impl.parsers.FTSQueryParser; -import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext; +import org.alfresco.repo.search.impl.querymodel.impl.lucene.QueryBuilderContext; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.search.SearchParameters; @@ -47,13 +47,13 @@ import org.apache.solr.request.SolrQueryRequest; /** * @author andyh */ -public class Lucene4QueryBuilderContextSolrImpl implements LuceneQueryBuilderContext +public class Lucene4QueryBuilderContextSolrImpl implements QueryBuilderContext { private Solr4QueryParser lqp; private NamespacePrefixResolver namespacePrefixResolver; - private LuceneQueryParserAdaptor lqpa; + private QueryParserAdaptor lqpa; /** * Context for building lucene queries @@ -90,7 +90,7 @@ public class Lucene4QueryBuilderContextSolrImpl implements LuceneQueryBuilderCon /* (non-Javadoc) * @see org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext#getLuceneQueryParser() */ - public LuceneQueryParserAdaptor getLuceneQueryParserAdaptor() + public QueryParserAdaptor getLuceneQueryParserAdaptor() { return lqpa; } diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryParserAdaptor.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryParserAdaptor.java index e0c29c1e5..932ba20f8 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryParserAdaptor.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Lucene4QueryParserAdaptor.java @@ -29,11 +29,11 @@ package org.alfresco.solr.query; import java.util.List; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.AnalysisMode; -import org.alfresco.repo.search.adaptor.lucene.LuceneFunction; -import org.alfresco.repo.search.adaptor.lucene.LuceneQueryParserAdaptor; -import org.alfresco.repo.search.adaptor.lucene.LuceneQueryParserExpressionAdaptor; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryParserAdaptor; +import org.alfresco.repo.search.adaptor.QueryParserExpressionAdaptor; +import org.alfresco.repo.search.adaptor.AnalysisMode; +import org.alfresco.repo.search.adaptor.LuceneFunction; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; import org.alfresco.repo.search.impl.querymodel.Ordering; import org.alfresco.service.cmr.dictionary.PropertyDefinition; @@ -53,7 +53,7 @@ import org.apache.lucene.search.TermQuery; * @author Andy * */ -public class Lucene4QueryParserAdaptor implements LuceneQueryParserAdaptor +public class Lucene4QueryParserAdaptor implements QueryParserAdaptor { private Solr4QueryParser lqp; @@ -274,7 +274,7 @@ public class Lucene4QueryParserAdaptor implements LuceneQueryParserAdaptor expressionAdaptor = getExpressionAdaptor(); + QueryParserExpressionAdaptor expressionAdaptor = getExpressionAdaptor(); expressionAdaptor.addRequired(getMatchAllQuery()); expressionAdaptor.addExcluded(query); return expressionAdaptor.getQuery(); @@ -284,7 +284,7 @@ public class Lucene4QueryParserAdaptor implements LuceneQueryParserAdaptor getExpressionAdaptor() + public QueryParserExpressionAdaptor getExpressionAdaptor() { return new Lucene4QueryParserExpressionAdaptor(); } @@ -307,7 +307,7 @@ public class Lucene4QueryParserAdaptor implements LuceneQueryParserAdaptor + private class Lucene4QueryParserExpressionAdaptor implements QueryParserExpressionAdaptor { BooleanQuery.Builder booleanQuery = new BooleanQuery.Builder(); diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java index d8fe79b41..4dfa281c2 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java @@ -30,9 +30,9 @@ import edu.umd.cs.findbugs.annotations.SuppressWarnings; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.IndexTokenisationMode; import org.alfresco.repo.search.MLAnalysisMode; -import org.alfresco.repo.search.adaptor.lucene.AnalysisMode; -import org.alfresco.repo.search.adaptor.lucene.LuceneFunction; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.AnalysisMode; +import org.alfresco.repo.search.adaptor.LuceneFunction; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.repo.search.impl.QueryParserUtils; import org.alfresco.repo.search.impl.lucene.analysis.MLTokenDuplicator; import org.alfresco.repo.search.impl.parsers.FTSQueryException; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthorityQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthorityQuery.java index 8adba04ae..5d96000fa 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthorityQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthorityQuery.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.Set; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthoritySetQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthoritySetQuery.java index 7ced34aa0..f3e53bb75 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthoritySetQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrAuthoritySetQuery.java @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.List; import java.util.Properties; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.solr.data.GlobalReaders; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedQuery.java index 81393449a..8c2fd2523 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedQuery.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.Set; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedScorer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedScorer.java index b9e6de2a3..4b5d29682 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedScorer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedScorer.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetQuery.java index 5618a038f..e7f6329b3 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetQuery.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.ConstantScoreQuery; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer.java index 1c9f2d53c..398480b2a 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer2.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer2.java index bffd3b86f..fe951a5c7 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer2.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer2.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.HashSet; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerQuery.java index 8857601f2..153b8c824 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerQuery.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.Collector; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerScorer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerScorer.java index 2853fe449..7138b1e47 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerScorer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerScorer.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReaderContext; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetQuery.java index f4ca02f58..dcb31e3d5 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetQuery.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.Set; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetScorer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetScorer.java index b7f5962d6..e88a7c3af 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetScorer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrOwnerSetScorer.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReaderContext; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderQuery.java index 02ffa736c..a3e5178b7 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderQuery.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.Set; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderScorer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderScorer.java index 600fcf3f2..70d0a0ea8 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderScorer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderScorer.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetQuery.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetQuery.java index 0d43ee142..15c2de074 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetQuery.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetQuery.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.Set; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer.java index 5e84aae32..19b14b6a7 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer2.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer2.java index 85ea519e5..5b451c8a8 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer2.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer2.java @@ -29,7 +29,7 @@ package org.alfresco.solr.query; import java.io.IOException; import java.util.HashSet; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.cache.CacheConstants; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java index 068a4e3ed..e38000599 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java @@ -74,7 +74,6 @@ public class MLAnalayserTest { analyser = new MLAnalayser(mlAnalaysisMode); PropertyDefinition propDef = Mockito.mock(PropertyDefinition.class); - when(propDef.resolveAnalyserClassName(any(Locale.class))).thenReturn(StandardAnalyzer.class.getName()); //AlfrescoStandardAnalyser.class.getName()); when(dictionaryService.getProperty(any(QName.class))).thenReturn(propDef); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java index f424ab9d3..552e2416a 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java @@ -27,7 +27,7 @@ package org.alfresco.solr; import static java.util.Arrays.asList; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; import org.alfresco.solr.client.Node; import org.alfresco.solr.client.NodeMetaData; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java index c910878ab..30eb6e3a6 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java @@ -30,36 +30,36 @@ import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertTrue; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ACLID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ACLTXCOMMITTIME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ANAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ANCESTOR; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_APATH; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ASPECT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ASSOCTYPEQNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DBID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DENIED; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_INACLTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_INTXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_ISNODE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_LID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_OWNER; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PARENT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PARENT_ASSOC_CRC; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PATH; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PRIMARYASSOCQNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PRIMARYASSOCTYPEQNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_PRIMARYPARENT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_QNAME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_READER; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_SOLR4_ID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TENANT; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXCOMMITTIME; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXID; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TYPE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_VERSION; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ACLID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ACLTXCOMMITTIME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ANAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ANCESTOR; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_APATH; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ASPECT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ASSOCTYPEQNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DBID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DENIED; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_INACLTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_INTXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_ISNODE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_LID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_OWNER; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PARENT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PARENT_ASSOC_CRC; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PATH; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PRIMARYASSOCQNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PRIMARYASSOCTYPEQNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_PRIMARYPARENT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_QNAME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_READER; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_SOLR4_ID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TENANT; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TXCOMMITTIME; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TXID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_VERSION; import static org.junit.Assert.assertEquals; import java.io.IOException; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrInformationServerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrInformationServerTest.java index f0635aebd..2e4ba4f21 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrInformationServerTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrInformationServerTest.java @@ -68,7 +68,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.solr.client.NodeMetaData; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java index 598730b65..28d4b0c1f 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java @@ -38,7 +38,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getTransaction; import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java index bd52c43dd..a7773508c 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java @@ -34,7 +34,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.*; import java.util.Map; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.namespace.QName; import org.alfresco.solr.AbstractAlfrescoSolrIT; import org.alfresco.solr.client.*; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java index 83e8d8fe7..7ff575579 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java @@ -27,7 +27,7 @@ package org.alfresco.solr.query; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoSolrIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java index 50351ec00..a57291252 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java @@ -28,7 +28,7 @@ package org.alfresco.solr.query; import java.io.IOException; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.repo.search.impl.parsers.FTSQueryParser; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.solr.SolrInformationServer; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java index bf5db0454..47168cd12 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java @@ -41,7 +41,7 @@ import java.util.List; import java.util.Random; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java index 73c7fb2bf..7c2b99a1b 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.query; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoSolrIT; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.SolrTestCaseJ4; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java index 29474c454..fe2bfb9d8 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.query.afts.qparser; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.dataload.TestDataProvider; import org.alfresco.util.ISO9075; import org.junit.BeforeClass; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java index dbed2ad9a..ff7172625 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java @@ -40,7 +40,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.namespace.QName; import org.alfresco.solr.dataload.TestDataProvider; import org.alfresco.util.CachingDateFormat; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java index 7652b42b1..ce6557fe8 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java @@ -32,7 +32,7 @@ import static org.alfresco.model.ContentModel.PROP_CONTENT; import static org.alfresco.model.ContentModel.PROP_NAME; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.namespace.QName; import org.alfresco.solr.AlfrescoSolrDataModel; import org.alfresco.solr.SolrInformationServer; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java index 9bcbc2e6e..80c6b66d8 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.query.cmis; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.SolrTestCaseJ4; import org.junit.Test; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java index 42ce42091..edf207217 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.List; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.solr.AbstractAlfrescoSolrIT; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java index ea9847166..3e0d935be 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Locale; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.solr.AbstractAlfrescoSolrIT; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java index 97d68a015..af1595563 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java @@ -38,7 +38,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.list; import java.util.Collection; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoSolrIT; import org.alfresco.solr.AlfrescoCoreAdminHandler; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java index c267815fc..d45fe0f9e 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import org.alfresco.repo.index.shard.ShardState; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoSolrIT; import org.alfresco.solr.AlfrescoCoreAdminHandler; import org.alfresco.solr.client.Acl; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java index 7be0c52a8..d44a0cad6 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java @@ -40,7 +40,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.solr.AbstractAlfrescoSolrIT; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java index a9f0008cc..d8e94c226 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java @@ -49,7 +49,7 @@ import java.util.List; import java.util.Properties; import java.util.Random; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; import static org.alfresco.solr.AlfrescoSolrUtils.getAcl; import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet; import static org.alfresco.solr.AlfrescoSolrUtils.getAclReaders; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java index bc9d68287..381e8f517 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java @@ -31,7 +31,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getNode; import static org.alfresco.solr.AlfrescoSolrUtils.getNodeMetaData; import static org.alfresco.solr.AlfrescoSolrUtils.getTransaction; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java index 04bab0422..992e02738 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java @@ -38,7 +38,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getNodeMetaData; import static org.alfresco.solr.AlfrescoSolrUtils.getTransaction; import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerLargeTxnIdIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerLargeTxnIdIT.java index 6296dd9e6..c0b96edd4 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerLargeTxnIdIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerLargeTxnIdIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.tracker; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java index bc2cec9d2..3a502396d 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.tracker; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java index 8d5b2c01d..610022573 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java @@ -40,7 +40,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getTransaction; import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet; import org.alfresco.repo.index.shard.ShardState; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.AlfrescoCoreAdminHandler; import org.alfresco.solr.client.Acl; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoTrackerWithDelayedTransactionsIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoTrackerWithDelayedTransactionsIT.java index 60258626c..66a2e2d92 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoTrackerWithDelayedTransactionsIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoTrackerWithDelayedTransactionsIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.tracker; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; import org.alfresco.solr.client.AclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java index 97171dc01..43a797b24 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java @@ -28,7 +28,7 @@ package org.alfresco.solr.tracker; import static java.util.Collections.singletonList; import static java.util.stream.IntStream.range; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; import static org.alfresco.solr.AlfrescoSolrUtils.getAcl; import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet; import static org.alfresco.solr.AlfrescoSolrUtils.getAclReaders; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java index c0e77989c..fc5d52c90 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java @@ -46,7 +46,7 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; import static org.alfresco.solr.AlfrescoSolrUtils.getAcl; import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet; import static org.alfresco.solr.AlfrescoSolrUtils.getAclReaders; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java index 5154ec876..a1a234203 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java @@ -26,7 +26,7 @@ package org.alfresco.solr.tracker; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.SolrInformationServer; import org.alfresco.solr.client.Acl; @@ -52,8 +52,8 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_SOLR4_ID; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_SOLR4_ID; import static org.alfresco.solr.AlfrescoSolrUtils.MAX_WAIT_TIME; import static org.alfresco.solr.AlfrescoSolrUtils.getAcl; import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java index bbd5bcd1a..e9f269a95 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java @@ -52,7 +52,7 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; import static org.alfresco.solr.AlfrescoSolrUtils.getAcl; import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet; import static org.alfresco.solr.AlfrescoSolrUtils.getAclReaders; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java index a380182d8..979c90774 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java @@ -28,7 +28,7 @@ package org.alfresco.solr.tracker; import static java.util.Collections.singletonList; -import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE; +import static org.alfresco.repo.search.adaptor.QueryConstants.FIELD_DOC_TYPE; import static org.alfresco.solr.AlfrescoSolrUtils.getAcl; import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet; import static org.alfresco.solr.AlfrescoSolrUtils.getAclReaders; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/AlfrescoFieldMapperTransformerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/AlfrescoFieldMapperTransformerIT.java index c85eccde6..5608de147 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/AlfrescoFieldMapperTransformerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/AlfrescoFieldMapperTransformerIT.java @@ -28,7 +28,7 @@ package org.alfresco.solr.transformer; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; import org.alfresco.model.ContentModel; -import org.alfresco.repo.search.adaptor.lucene.QueryConstants; +import org.alfresco.repo.search.adaptor.QueryConstants; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.solr.AbstractAlfrescoDistributedIT; import org.alfresco.solr.client.Acl; diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 52cc3c48f..6a89ba9b1 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,8 +22,8 @@ - 8.148 - 2.11.2 + 8.319 + 2.11.3 diff --git a/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientTest.java b/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientTest.java index b36fdfc8b..b63b34777 100644 --- a/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientTest.java +++ b/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientTest.java @@ -159,8 +159,6 @@ public class SOLRAPIClientTest extends TestCase new ThreadPoolExecutor.CallerRunsPolicy()); compiledModelsCache.setThreadPoolExecutor(threadPoolExecutor); dictionaryDAO.setDictionaryRegistryCache(compiledModelsCache); - // TODO: use config .... - dictionaryDAO.setDefaultAnalyserResourceBundleName("alfresco/model/dataTypeAnalyzers"); dictionaryDAO.setResourceClassLoader(getResourceClassLoader()); dictionaryDAO.init(); diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index 3afcbe086..0d81a0863 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -28,7 +28,7 @@ xpp3-1.1.4c.jar http://www.extreme.indiana.edu/dist/java-repository/xpp3/license === JSON === -json-20160212.jar http://code.google.com/p/json-simple/ +json-20200518.jar https://github.com/stleary/JSON-java === Apache 2.0 === @@ -55,18 +55,18 @@ cxf-rt-wsdl-3.2.14.jar https://cxf.apache.org/ chemistry-opencmis-server-support-1.0.0.jar http://chemistry.apache.org/ chemistry-opencmis-server-bindings-1.0.0.jar http://chemistry.apache.org/ quartz-2.3.2.jar http://quartz-scheduler.org/ -jackson-core-2.11.2.jar https://github.com/FasterXML/jackson -jackson-annotations-2.11.2.jar https://github.com/FasterXML/jackson -jackson-databind-2.11.2.jar https://github.com/FasterXML/jackson +jackson-core-2.11.3.jar https://github.com/FasterXML/jackson +jackson-annotations-2.11.3.jar https://github.com/FasterXML/jackson +jackson-databind-2.11.3.jar https://github.com/FasterXML/jackson commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/ -spring-aop-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-beans-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-context-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-core-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-expression-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-jdbc-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-orm-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-tx-5.2.8.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-aop-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-beans-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-context-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-core-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-expression-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-jdbc-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-orm-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-tx-5.2.9.RELEASE.jar http://projects.spring.io/spring-framework/ xercesImpl-2.12.0-alfresco-patched-20191004.jar http://xerces.apache.org/xerces2-j guessencoding-1.4.jar http://docs.codehaus.org/display/GUESSENC/ xml-apis-1.4.01.jar https://github.com/FasterXML/jackson