diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index b4a35b04b1..6ceec7a111 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -685,7 +685,7 @@ public class Case { for (KeywordSearchService searchService : Lookup.getDefault().lookupAll(KeywordSearchService.class )) { - searchService.deleteCores(metadata.getTextIndexName(), metadata.getCaseDirectory()); + searchService.deleteCore(metadata.getTextIndexName(), metadata.getCaseDirectory()); } if (CaseType.MULTI_USER_CASE == metadata.getCaseType()) { diff --git a/Core/src/org/sleuthkit/autopsy/keywordsearchservice/KeywordSearchService.java b/Core/src/org/sleuthkit/autopsy/keywordsearchservice/KeywordSearchService.java index da06adc743..569649a6dc 100644 --- a/Core/src/org/sleuthkit/autopsy/keywordsearchservice/KeywordSearchService.java +++ b/Core/src/org/sleuthkit/autopsy/keywordsearchservice/KeywordSearchService.java @@ -55,9 +55,10 @@ public interface KeywordSearchService extends Closeable { * @param textIndexName The text index name. * * @throws KeywordSearchServiceException if unable to delete. + * @deprecated deleteCore(String textIndexName, String caseDirectory) should be used instead to support newer solr cores */ public void deleteTextIndex(String textIndexName) throws KeywordSearchServiceException; - public void deleteCores(String textIndexName, String caseDirectory) throws KeywordSearchServiceException; + public void deleteCore(String textIndexName, String caseDirectory) throws KeywordSearchServiceException; } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java index ded8d7f450..fa7bad504a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java @@ -148,8 +148,8 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService { * Deletes Solr core for a case. * * @param coreName The core name. + * @deprecated deleteCore(String textIndexName, String caseDirectory) should be used instead to support newer solr cores */ - @Deprecated @Override public void deleteTextIndex(String coreName) throws KeywordSearchServiceException { //If this was called with the metadata.textIndexName then this will only work on solr 4 cores @@ -393,7 +393,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService { * @throws KeywordSearchServiceException */ @Override - public void deleteCores(String textIndexName, String caseDirectory) throws KeywordSearchServiceException { + public void deleteCore(String textIndexName, String caseDirectory) throws KeywordSearchServiceException { String coreName = textIndexName; if (!caseDirectory.isEmpty()) { IndexMetadata indexMetadata;