From b3c6c61325428da4fffa9a546be2dbb27f9a183c Mon Sep 17 00:00:00 2001 From: ryounes Date: Wed, 13 Jul 2011 15:32:03 +0000 Subject: [PATCH] NIHVIVO-2775 Change names of Solr* controllers to remove the "Solr" prefix --- webapp/config/web.xml | 8 ++++---- .../{SolrJsonServlet.java => JsonServlet.java} | 12 ++++++------ ...Controller.java => IndividualListController.java} | 8 ++++---- ...teController.java => AutocompleteController.java} | 7 +++---- ...rchController.java => PagedSearchController.java} | 4 ++-- .../utils/pageDataGetter/BrowseDataGetter.java | 4 ++-- .../webapp/utils/pageDataGetter/DataGetterUtils.java | 12 ++++++------ .../vitro/webapp/web/widgets/BrowseWidget.java | 4 ++-- 8 files changed, 29 insertions(+), 30 deletions(-) rename webapp/src/edu/cornell/mannlib/vitro/webapp/controller/{SolrJsonServlet.java => JsonServlet.java} (98%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/{SolrIndividualListController.java => IndividualListController.java} (98%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/{SolrAutocompleteController.java => AutocompleteController.java} (97%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/{SolrPagedSearchController.java => PagedSearchController.java} (99%) diff --git a/webapp/config/web.xml b/webapp/config/web.xml index e6dab1f40..9b7ecee0a 100644 --- a/webapp/config/web.xml +++ b/webapp/config/web.xml @@ -870,7 +870,7 @@ IndividualListController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.SolrIndividualListController + edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController IndividualListController @@ -888,7 +888,7 @@ SearchController - edu.cornell.mannlib.vitro.webapp.search.controller.SolrPagedSearchController + edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController @@ -911,7 +911,7 @@ AutocompleteController - edu.cornell.mannlib.vitro.webapp.search.controller.SolrAutocompleteController + edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController AutocompleteController @@ -960,7 +960,7 @@ JSON Service - edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet + edu.cornell.mannlib.vitro.webapp.controller.JsonServlet JSON Service diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java index a6cadfbd3..bc89b9563 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java @@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.SolrIndividualListController; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; @@ -49,10 +49,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.DataGetterUtils; * @author bdc34 * */ -public class SolrJsonServlet extends VitroHttpServlet { +public class JsonServlet extends VitroHttpServlet { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(SolrJsonServlet.class); + private static final Log log = LogFactory.getLog(JsonServlet.class); private static final int REPLY_SIZE = 256; @Override @@ -254,11 +254,11 @@ public class SolrJsonServlet extends VitroHttpServlet { //Including version for Solr query for Vclass Intersections private static Map getSolrVClassIntersectionResults(List vclassURIs, VitroRequest vreq, ServletContext context){ - String alpha = SolrIndividualListController.getAlphaParameter(vreq); - int page = SolrIndividualListController.getPageParameter(vreq); + String alpha = IndividualListController.getAlphaParameter(vreq); + int page = IndividualListController.getPageParameter(vreq); Map map = null; try { - map = SolrIndividualListController.getResultsForVClassIntersections( + map = IndividualListController.getResultsForVClassIntersections( vclassURIs, page, alpha, diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java index b4e84db37..70be0b993 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java @@ -39,10 +39,10 @@ import freemarker.template.TemplateModel; /** * Generates a list of individuals for display in a template */ -public class SolrIndividualListController extends FreemarkerHttpServlet { +public class IndividualListController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(SolrIndividualListController.class.getName()); + private static final Log log = LogFactory.getLog(IndividualListController.class.getName()); private static final int INDIVIDUAL_LIST_CONTROLLER_MAX_RESULTS = 30000; private static final int INDIVIDUALS_PER_PAGE = 30; @@ -233,13 +233,13 @@ public class SolrIndividualListController extends FreemarkerHttpServlet { } if ( response == null ) { - throw new ServletException("Could not run search in SolrIndividualListController"); + throw new ServletException("Could not run search in IndividualListController"); } SolrDocumentList docs = response.getResults(); if (docs == null) { - throw new ServletException("Could not run search in SorlIndividualListController"); + throw new ServletException("Could not run search in IndividualListController"); } // get list of individuals for the search results diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrAutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrAutocompleteController.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java index 6faf6ddcb..af4a5e2d1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrAutocompleteController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java @@ -33,14 +33,13 @@ import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup; /** * AutocompleteController generates autocomplete content - * through a Solr search. + * via the search index. */ -// RY Rename to AutocompleteController once the transition to Solr is complete. -public class SolrAutocompleteController extends VitroAjaxController { +public class AutocompleteController extends VitroAjaxController { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(SolrAutocompleteController.class); + private static final Log log = LogFactory.getLog(AutocompleteController.class); //private static final String TEMPLATE_DEFAULT = "autocompleteResults.ftl"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java similarity index 99% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index bebeb1441..6c999200a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -62,10 +62,10 @@ import freemarker.template.Configuration; * */ -public class SolrPagedSearchController extends FreemarkerHttpServlet { +public class PagedSearchController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(SolrPagedSearchController.class); + private static final Log log = LogFactory.getLog(PagedSearchController.class); private static final int DEFAULT_HITS_PER_PAGE = 25; private static final int DEFAULT_MAX_HIT_COUNT = 1000; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java index f16d134d0..5fbbee18c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java @@ -19,7 +19,7 @@ import org.json.JSONObject; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; -import edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet; +import edu.cornell.mannlib.vitro.webapp.controller.JsonServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; @@ -81,7 +81,7 @@ public class BrowseDataGetter implements PageDataGetter { VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri); map.put("class", new VClassTemplateModel(vclass)); - JSONObject vclassRes = SolrJsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); + JSONObject vclassRes = JsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); map.put("totalCount", JsonToFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); map.put("alpha", JsonToFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); map.put("individuals", JsonToFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java index f02663c13..a35c4f3ea 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java @@ -23,9 +23,9 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; -import edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet; +import edu.cornell.mannlib.vitro.webapp.controller.JsonServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.SolrIndividualListController.PageRecord; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.PageRecord; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; @@ -231,11 +231,11 @@ public class DataGetterUtils { jo.put("imageUrl", ind.getImageUrl()); jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq)); - jo.put("mostSpecificTypes", SolrJsonServlet.getMostSpecificTypes(ind,fullWdf)); + jo.put("mostSpecificTypes", JsonServlet.getMostSpecificTypes(ind,fullWdf)); - jo.put("preferredTitle", SolrJsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf)); - jo.put("firstName", SolrJsonServlet.getDataPropertyValue(ind, fNameDp, fullWdf)); - jo.put("lastName", SolrJsonServlet.getDataPropertyValue(ind, lNameDp, fullWdf)); + jo.put("preferredTitle", JsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf)); + jo.put("firstName", JsonServlet.getDataPropertyValue(ind, fNameDp, fullWdf)); + jo.put("lastName", JsonServlet.getDataPropertyValue(ind, lNameDp, fullWdf)); jInds.put(jo); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java index e8dc3a8b7..1a6c419fb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java @@ -19,7 +19,7 @@ import org.json.JSONObject; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; -import edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet; +import edu.cornell.mannlib.vitro.webapp.controller.JsonServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; @@ -83,7 +83,7 @@ public class BrowseWidget extends Widget { VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri); map.put("class", new VClassTemplateModel(vclass)); - JSONObject vclassRes = SolrJsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); + JSONObject vclassRes = JsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); map.put("totalCount", JsonToFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); map.put("alpha", JsonToFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); map.put("individuals", JsonToFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") ));