inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-371: Changed core.getCoreDescriptor().getCoreContainer() to core.getCoreContainer()

Browse Source
This commit is contained in:
Gethin James
2017-06-06 12:06:15 +02:00
parent ac3eef0d4f
commit dce123136e
12 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java
+1 -1
View File
@@ -506,7 +506,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
private void createAndRegisterNewCore(SolrQueryResponse rsp, Properties extraProperties, StoreRef storeRef, File template, String coreName, File newCore, int shardCount, int shardInstance, String templateName) throws IOException,
FileNotFoundException
{
if (coreContainer.getCoreNames().contains(coreName))
if (coreContainer.getLoadedCoreNames().contains(coreName))
{
//Core alfresco exists
log.warn(coreName + " already exists, not creating again.");
alfresco-search/src/main/java/org/alfresco/solr/component/ConsistencyComponent.java
-1
View File
@@ -72,7 +72,6 @@ public class ConsistencyComponent extends SearchComponent
SolrQueryRequest req = rb.req;
AlfrescoCoreAdminHandler adminHandler = (AlfrescoCoreAdminHandler)
req.getCore().
getCoreDescriptor().
getCoreContainer().
getMultiCoreHandler();
alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class FingerPrintComponent extends SearchComponent implements SolrCoreAwa
{
if(req.getSearcher() != null)
{
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
return srv.getSolrContentStore();
alfresco-search/src/main/java/org/alfresco/solr/component/QueryLoggingComponent.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class QueryLoggingComponent extends SearchComponent
boolean isShard = rb.req.getParams().getBool(ShardParams.IS_SHARD, false);
if (!isShard)
{
CoreContainer container = rb.req.getCore().getCoreDescriptor().getCoreContainer();
CoreContainer container = rb.req.getCore().getCoreContainer();
SolrCore logCore = container.getCore(rb.req.getCore().getName() + "_qlog");
if (logCore != null)
{
alfresco-search/src/main/java/org/alfresco/solr/lifecycle/SolrCoreLoadListener.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class SolrCoreLoadListener extends AbstractSolrEventListener {
@Override
public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
CoreContainer coreContainer = getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrCoreLoadRegistration.registerForCore(coreAdminHandler, coreContainer, getCore(), getCore().getName());
alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+2 -2
View File
@@ -159,7 +159,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
this.solrParams = req.getParams();
SolrCore core = req.getCore();
if(core != null) {
this.shardHandlerFactory = core.getCoreDescriptor().getCoreContainer().getShardHandlerFactory();
this.shardHandlerFactory = core.getCoreContainer().getShardHandlerFactory();
}
this.request = req;
@@ -179,7 +179,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
{
if(req.getSearcher() != null)
{
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
return srv.getSolrContentStore();
alfresco-search/src/main/java/org/alfresco/solr/transformer/CachedDocTransformer.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class CachedDocTransformer extends DocTransformer
{
String id = getFieldValueString(doc, FIELD_SOLR4_ID);
TenantAclIdDbId tenantAndDbId = AlfrescoSolrDataModel.decodeNodeDocumentId(id);
CoreContainer coreContainer = context.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = context.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(context.getSearcher().getCore().getName());
SolrContentStore solrContentStore = srv.getSolrContentStore();
alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSearchHandler.java
+2 -4
View File
@@ -140,8 +140,7 @@ public class AlfrescoSearchHandler extends RequestHandlerBase implements
"First/Last components only valid if you do not declare 'components'");
if (shfInfo == null) {
shardHandlerFactory = core.getCoreDescriptor().getCoreContainer()
.getShardHandlerFactory();
shardHandlerFactory = core.getCoreContainer().getShardHandlerFactory();
} else {
shardHandlerFactory = core.createInitInstance(shfInfo,
ShardHandlerFactory.class, null, null);
@@ -259,8 +258,7 @@ public class AlfrescoSearchHandler extends RequestHandlerBase implements
rb.isDistrib = req.getParams().getBool(
"distrib",
req.getCore().getCoreDescriptor().getCoreContainer()
.isZooKeeperAware());
req.getCore().getCoreContainer().isZooKeeperAware());
if (!rb.isDistrib) {
// for back compat, a shards param with URLs like
// localhost:8983/solr will mean that this
alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrClusteringComponent.java
+1 -1
View File
@@ -295,7 +295,7 @@ public class AlfrescoSolrClusteringComponent extends SearchComponent implements
TenantAclIdDbId tenantAndDbId = AlfrescoSolrDataModel
.decodeNodeDocumentId(id);
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
SolrContentStore solrContentStore = srv.getSolrContentStore();
alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
+1 -1
View File
@@ -599,7 +599,7 @@ public class AlfrescoSolrHighlighter extends DefaultSolrHighlighter implements
String id = getFieldValueString(doc, FIELD_SOLR4_ID);
TenantAclIdDbId tenantAndDbId = AlfrescoSolrDataModel
.decodeNodeDocumentId(id);
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
SolrContentStore solrContentStore = srv.getSolrContentStore();
alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
@BeforeClass
public static void beforeClass() throws Exception {
initAlfrescoCore("schema.xml");
admin = (AlfrescoCoreAdminHandler)h.getCore().getCoreDescriptor().getCoreContainer().getMultiCoreHandler();
admin = (AlfrescoCoreAdminHandler)h.getCore().getCoreContainer().getMultiCoreHandler();
}
@After
alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackTest.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class AlfrescoSolrTrackerRollbackTest extends AbstractAlfrescoSolrTests
public void testTrackers() throws Exception
{
AlfrescoCoreAdminHandler alfrescoCoreAdminHandler = (AlfrescoCoreAdminHandler)h.getCore().getCoreDescriptor().getCoreContainer().getMultiCoreHandler();
AlfrescoCoreAdminHandler alfrescoCoreAdminHandler = (AlfrescoCoreAdminHandler)h.getCore().getCoreContainer().getMultiCoreHandler();
/*