litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better name for SearchEngineWrapper

Browse source
This commit is contained in:
Jim Blake 2014-10-13 15:38:41 -04:00
parent 78c8f102f8
commit 3877ba1c3e
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
View file

@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage; import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage;
import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor; import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine;
import edu.cornell.mannlib.vitro.webapp.searchengine.SearchEngineWrapper; import edu.cornell.mannlib.vitro.webapp.searchengine.InstrumentedSearchEngineWrapper;
import edu.cornell.mannlib.vitro.webapp.searchengine.solr.SolrSearchEngine; import edu.cornell.mannlib.vitro.webapp.searchengine.solr.SolrSearchEngine;
import edu.cornell.mannlib.vitro.webapp.startup.ComponentStartupStatusImpl; import edu.cornell.mannlib.vitro.webapp.startup.ComponentStartupStatusImpl;
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
@ -85,7 +85,7 @@ public class ApplicationImpl implements Application {
ComponentStartupStatus css = new ComponentStartupStatusImpl( ComponentStartupStatus css = new ComponentStartupStatusImpl(
this, ss); this, ss);
SearchEngine searchEngine = new SearchEngineWrapper( SearchEngine searchEngine = new InstrumentedSearchEngineWrapper(
new SolrSearchEngine()); new SolrSearchEngine());
searchEngine.startup(application, css); searchEngine.startup(application, css);
application.setSearchEngine(searchEngine); application.setSearchEngine(searchEngine);

10
webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineWrapper.java → webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/InstrumentedSearchEngineWrapper.java
View file

@ -20,16 +20,18 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResponse; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResponse;
/** /**
* TODO * Manages the life-cycle of the SearchEngine. Adds logging, controlled by
* DeveloperSettings.
*/ */
public class SearchEngineWrapper implements SearchEngine { public class InstrumentedSearchEngineWrapper implements SearchEngine {
private static final Log log = LogFactory.getLog(SearchEngineWrapper.class); private static final Log log = LogFactory
.getLog(InstrumentedSearchEngineWrapper.class);
private final SearchEngine innerEngine; private final SearchEngine innerEngine;
private volatile LifecycleState lifecycleState = NEW; private volatile LifecycleState lifecycleState = NEW;
public SearchEngineWrapper(SearchEngine innerEngine) { public InstrumentedSearchEngineWrapper(SearchEngine innerEngine) {
if (innerEngine == null) { if (innerEngine == null) {
throw new NullPointerException("innerEngine may not be null."); throw new NullPointerException("innerEngine may not be null.");
} }

2
webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineLogger.java
View file

@ -254,7 +254,7 @@ public abstract class SearchEngineLogger implements AutoCloseable {
QueryLogger(SearchQuery query) { QueryLogger(SearchQuery query) {
this.query = query; this.query = query;
this.stackTrace = new StackTraceUtility(SearchEngineWrapper.class, this.stackTrace = new StackTraceUtility(InstrumentedSearchEngineWrapper.class,
true); true);
this.passesRestrictions = passesQueryRestriction() this.passesRestrictions = passesQueryRestriction()
&& passesStackRestriction(); && passesStackRestriction();