From 636ab2bf650743300305747f5b0945c7bf67e032 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 29 Jul 2010 21:37:14 +0000 Subject: [PATCH] 1. Refactored code to use the vis services provided via dependency injection method. --- .../VisualizationController.java | 70 ++++++------------- .../visutils/IVisRequestHandler.java | 6 -- 2 files changed, 21 insertions(+), 55 deletions(-) delete mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/IVisRequestHandler.java diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationController.java index aec7df61..8bf4225d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationController.java @@ -56,11 +56,7 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipRequestHandler; -import edu.cornell.mannlib.vitro.webapp.visualization.collegepubcount.CollegePublicationCountRequestHandler; -import edu.cornell.mannlib.vitro.webapp.visualization.personlevel.PersonLevelRequestHandler; -import edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountRequestHandler; -import edu.cornell.mannlib.vitro.webapp.visualization.utilities.UtilitiesRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** @@ -112,7 +108,7 @@ public class VisualizationController extends BaseEditController { .getRealPath("/WEB-INF/visualization/visualizations-beans-injection.xml"); ApplicationContext context = new ClassPathXmlApplicationContext( - resourcePath); + "file:" + resourcePath); BeanFactory factory = context; @@ -122,9 +118,7 @@ public class VisualizationController extends BaseEditController { visualizationIDsToClass = visualizationInjector.getVisualizationIDToClass(); } catch (Exception e) { - e.printStackTrace(); - System.out.println(e); } } @@ -146,51 +140,23 @@ public class VisualizationController extends BaseEditController { String visTypeURLHandle = vreq.getParameter(VIS_TYPE_URL_HANDLE); VisualizationRequestHandler visRequestHandler = null; - - if (PERSON_PUBLICATION_COUNT_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) { - - visRequestHandler = new PersonPublicationCountRequestHandler(); - - } else if (COLLEGE_PUBLICATION_COUNT_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) { - - visRequestHandler = new CollegePublicationCountRequestHandler(); - - } else if (COAUTHORSHIP_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) { - - visRequestHandler = new CoAuthorshipRequestHandler(); - - - } else if (PERSON_LEVEL_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) { - - visRequestHandler = new PersonLevelRequestHandler(); - - } else if (UTILITIES_URL_VALUE - .equalsIgnoreCase(visTypeURLHandle)) { - - visRequestHandler = new UtilitiesRequestHandler(); - - } else { - - log.debug("vis uqery parameter value -> " + vreq.getParameter("vis")); - log.debug("uri uqery parameter value -> " + vreq.getParameter("uri")); - log.debug("render_mode query parameter value -> " + vreq.getParameter("render_mode")); + try { + visRequestHandler = visualizationIDsToClass.get(visTypeURLHandle); + } catch (NullPointerException nullKey) { /* - * This is side-effecting because the error content is directly + * This is side-effecting because the error content is directly * added to the request object. From where it is redirected to * the error page. * */ handleMalformedParameters("Inappropriate query parameters were submitted. ", - request, - response); - } - - String rdfResultFormatParam = "RDF/XML-ABBREV"; - + request, + response); + } + DataSource dataSource = setupJENADataSource(request, response, - vreq, - rdfResultFormatParam); + vreq); if (dataSource != null && visRequestHandler != null) { @@ -204,7 +170,14 @@ public class VisualizationController extends BaseEditController { } else { - log.error("ERROR! Data Model Empty &/or inapproppriate vis request made"); + String errorMessage = "Data Model Empty &/or Inappropriate " + + "query parameters were submitted. "; + + handleMalformedParameters(errorMessage, + request, + response); + + log.error(errorMessage); } return; @@ -249,8 +222,7 @@ public class VisualizationController extends BaseEditController { } private DataSource setupJENADataSource(HttpServletRequest request, - HttpServletResponse response, VitroRequest vreq, - String rdfResultFormatParam) { + HttpServletResponse response, VitroRequest vreq) { Model model = vreq.getJenaOntModel(); // getModel() if (model == null) { @@ -258,7 +230,7 @@ public class VisualizationController extends BaseEditController { return null; } - log.debug("rdfResultFormat was: " + rdfResultFormatParam); + log.debug("rdfResultFormat was: " + VisConstants.RDF_RESULT_FORMAT_PARAM); DataSource dataSource = DatasetFactory.create(); ModelMaker maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker"); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/IVisRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/IVisRequestHandler.java deleted file mode 100644 index 484f59c5..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/IVisRequestHandler.java +++ /dev/null @@ -1,6 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.visutils; - -public interface IVisRequestHandler { - public void doSomething(); -}