inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-2445: Adding Elasticsearch Search Subsystem as Only Enterprise option

Browse Source
This commit is contained in:
Angel Borroy
2020-10-06 10:08:42 +02:00
parent 7b99a414b0
commit dfd5af550a
27 changed files with 265 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repository/src/test/java/org/alfresco/AllDBTestsTestSuite.java
View File

@@ -64,7 +64,7 @@ import org.junit.runners.Suite;
org.alfresco.repo.domain.patch.AppliedPatchDAOTest.class,
org.alfresco.repo.domain.permissions.AclCrudDAOTest.class,
org.alfresco.repo.domain.usage.UsageDAOTest.class,
org.alfresco.repo.domain.solr.SOLRDAOTest.class,
org.alfresco.repo.domain.solr.SearchDAOTest.class,
org.alfresco.repo.domain.tenant.TenantAdminDAOTest.class,
// REPO-1012 : run AuditDAOTest and PropertyValueCleanupTest near the end

2
repository/src/test/java/org/alfresco/AppContext05TestSuite.java
View File

@@ -71,7 +71,7 @@ import org.junit.runners.Suite;
org.alfresco.repo.domain.patch.AppliedPatchDAOTest.class,
org.alfresco.repo.domain.permissions.AclCrudDAOTest.class,
org.alfresco.repo.domain.usage.UsageDAOTest.class,
org.alfresco.repo.domain.solr.SOLRDAOTest.class,
org.alfresco.repo.domain.solr.SearchDAOTest.class,
org.alfresco.repo.domain.tenant.TenantAdminDAOTest.class,
// REPO-1012 : run AuditDAOTest and PropertyValueCleanupTest near the end

16
repository/src/test/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java → repository/src/test/java/org/alfresco/repo/domain/solr/SearchDAOTest.java
View File

@@ -67,7 +67,7 @@ import org.springframework.context.ConfigurableApplicationContext;
* @since 4.0
*/
@Category({OwnJVMTestsCategory.class, DBTests.class})
public class SOLRDAOTest extends TestCase
public class SearchDAOTest extends TestCase
{
private ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext();
@@ -77,13 +77,13 @@ public class SOLRDAOTest extends TestCase
private TransactionService transactionService;
private NodeService nodeService;
private AclDAO aclDaoComponent;
private SOLRDAO solrDAO;
private SearchDAO searchDAO;
private NodeDAO nodeDAO;
@Override
public void setUp() throws Exception
{
solrDAO = (SOLRDAO)ctx.getBean("solrDAO");
searchDAO = (SearchDAO)ctx.getBean("searchDAO");
nodeDAO = (NodeDAO)ctx.getBean("nodeDAO");
authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");
@@ -103,7 +103,7 @@ public class SOLRDAOTest extends TestCase
@Override
public List<Node> execute() throws Throwable
{
return solrDAO.getNodes(nodeParameters, null, null);
return searchDAO.getNodes(nodeParameters, null, null);
}
}, true);
}
@@ -115,7 +115,7 @@ public class SOLRDAOTest extends TestCase
@Override
public List<Acl> execute() throws Throwable
{
return solrDAO.getAcls(aclChangeSetIds, minAclId, maxResults);
return searchDAO.getAcls(aclChangeSetIds, minAclId, maxResults);
}
}, true);
}
@@ -130,7 +130,7 @@ public class SOLRDAOTest extends TestCase
@Override
public List<Transaction> execute() throws Throwable
{
return solrDAO.getTransactions(minTxnId, fromCommitTime, maxTxnId, toCommitTime, maxResults);
return searchDAO.getTransactions(minTxnId, fromCommitTime, maxTxnId, toCommitTime, maxResults);
}
}, true);
}
@@ -145,7 +145,7 @@ public class SOLRDAOTest extends TestCase
@Override
public List<AclChangeSet> execute() throws Throwable
{
return solrDAO.getAclChangeSets(minAclChangeSetId, fromCommitTime, maxAclChangeSetId, toCommitTime, maxResults);
return searchDAO.getAclChangeSets(minAclChangeSetId, fromCommitTime, maxAclChangeSetId, toCommitTime, maxResults);
}
}, true);
}
@@ -449,7 +449,7 @@ public class SOLRDAOTest extends TestCase
List<Long> aclChangeSetIds = new ArrayList<Long>();
aclChangeSetIds.add(aclProps.getAclChangeSetId());
List<Acl> acls = solrDAO.getAcls(aclChangeSetIds, null, 1000);
List<Acl> acls = searchDAO.getAcls(aclChangeSetIds, null, 1000);
assertTrue("Shared Acl should be found by solrDAO so that it can be indexed", containsAclId(acls, sharedAclId));
}
finally

6
repository/src/test/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java
View File

@@ -37,7 +37,7 @@ import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.node.Node;
import org.alfresco.repo.domain.solr.SOLRDAO;
import org.alfresco.repo.domain.solr.SearchDAO;
import org.alfresco.repo.search.impl.lucene.LuceneQueryLanguageSPI;
import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet;
import org.alfresco.repo.search.impl.querymodel.QueryModelException;
@@ -68,7 +68,7 @@ public class DbOrIndexSwitchingQueryLanguageTest
private @Mock LuceneQueryLanguageSPI indexQueryLang;
private @Mock SolrJSONResultSet indexResults;
private @Mock ResultSet dbResults;
private @Mock SOLRDAO solrDAO;
private @Mock SearchDAO solrDAO;
private List<Node> changedNodes;
@Before
@@ -77,7 +77,7 @@ public class DbOrIndexSwitchingQueryLanguageTest
queryLang = new DbOrIndexSwitchingQueryLanguage();
queryLang.setDbQueryLanguage(dbQueryLang);
queryLang.setIndexQueryLanguage(indexQueryLang);
queryLang.setSolrDao(solrDAO);
queryLang.setSearchDao(solrDAO);
searchParameters = new SearchParameters();
changedNodes = new ArrayList<>();

17
repository/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
View File

@@ -45,9 +45,10 @@ import org.alfresco.repo.domain.node.Node;
import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.node.db.DbNodeServiceImpl;
import org.alfresco.repo.search.SearchTrackingComponent;
import org.alfresco.repo.search.SearchTrackingComponent.NodeMetaDataQueryCallback;
import org.alfresco.repo.search.SearchTrackingComponent.NodeQueryCallback;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback;
import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.ServiceRegistry;
@@ -95,7 +96,7 @@ public class SOLRTrackingComponentTest extends BaseSpringTest
private NodeDAO nodeDAO;
private QNameDAO qnameDAO;
private DictionaryDAO dictionaryDAO;
private SOLRTrackingComponent solrTrackingComponent;
private SearchTrackingComponent solrTrackingComponent;
private DbNodeServiceImpl dbNodeService;
private StoreRef storeRef;
@@ -108,7 +109,7 @@ public class SOLRTrackingComponentTest extends BaseSpringTest
transactionService = serviceRegistry.getTransactionService();
txnHelper = transactionService.getRetryingTransactionHelper();
solrTrackingComponent = (SOLRTrackingComponent) applicationContext.getBean("solrTrackingComponent");
solrTrackingComponent = (SearchTrackingComponent) applicationContext.getBean("searchTrackingComponent");
nodeDAO = (NodeDAO)applicationContext.getBean("nodeDAO");
qnameDAO = (QNameDAO) applicationContext.getBean("qnameDAO");
dictionaryDAO = (DictionaryDAO)applicationContext.getBean("dictionaryDAO");
@@ -208,7 +209,7 @@ public class SOLRTrackingComponentTest extends BaseSpringTest
}
/**
* Call {@link SOLRTrackingComponent#getTransactions(Long, Long, Long, Long, int)} in a transaction
* Call {@link SearchTrackingComponent#getTransactions(Long, Long, Long, Long, int)} in a transaction
*/
private List<Transaction> getTransactions(
final Long minTxnId, final Long fromCommitTime,
@@ -227,7 +228,7 @@ public class SOLRTrackingComponentTest extends BaseSpringTest
}
/**
* Call {@link SOLRTrackingComponent#getNodes(NodeParameters, NodeQueryCallback)} in a transaction
* Call {@link SearchTrackingComponent#getNodes(NodeParameters, NodeQueryCallback)} in a transaction
*/
private void getNodes(final NodeParameters nodeParameters, final SOLRTest bt)
{
@@ -249,7 +250,7 @@ public class SOLRTrackingComponentTest extends BaseSpringTest
}
/**
* Call {@link SOLRTrackingComponent#getAcls(List, Long, int)} in a transaction
* Call {@link SearchTrackingComponent#getAcls(List, Long, int)} in a transaction
*/
@SuppressWarnings("unused")
private List<Acl> getAcls(final List<Long> aclChangeSetIds, final Long minAclId, final int maxResults)
@@ -266,7 +267,7 @@ public class SOLRTrackingComponentTest extends BaseSpringTest
}
/**
* Call {@link SOLRTrackingComponent#getAclChangeSets(Long, Long, Long, Long, int)} in a transaction
* Call {@link SearchTrackingComponent#getAclChangeSets(Long, Long, Long, Long, int)} in a transaction
*/
private List<AclChangeSet> getAclChangeSets(
final Long minAclChangeSetId, final Long fromCommitTime,