From 090b6b7b3e0b88799ab23996e2d052cf0e5830ed Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Tue, 24 May 2016 17:37:32 +0100 Subject: [PATCH] [VIVO-1245] Cleanup of ProcessDataGetterN3Map --- .../utils/ProcessDataGetterN3Map.java | 25 ----------------- .../webapp/startup/DataGetterN3Setup.java | 27 +++++++++++++++++++ .../WEB-INF/resources/startup_listeners.txt | 1 + 3 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java create mode 100644 api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java deleted file mode 100644 index b97eb540..00000000 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java +++ /dev/null @@ -1,25 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils; - -import java.util.HashMap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/* - * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO. - */ -public class ProcessDataGetterN3Map { - private static final Log log = LogFactory.getLog(ProcessDataGetterN3Map.class); - public static HashMap getDataGetterTypeToProcessorMap() { - HashMap map = new HashMap(); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3"); - - return map; - } -} \ No newline at end of file diff --git a/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java b/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java new file mode 100644 index 00000000..0b324ba5 --- /dev/null +++ b/api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java @@ -0,0 +1,27 @@ +package org.vivoweb.webapp.startup; + +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Map; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import java.util.HashMap; + +public class DataGetterN3Setup implements ServletContextListener { + @Override + public void contextInitialized(ServletContextEvent servletContextEvent) { + HashMap map = new HashMap(); + map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3"); + map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3"); + map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3"); + map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3"); + map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3"); + + ProcessDataGetterN3Map.replaceDataGetterMap(map); + } + + @Override + public void contextDestroyed(ServletContextEvent servletContextEvent) { + + } +} diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt index cbc9305d..7ce8f93a 100644 --- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt +++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt @@ -57,6 +57,7 @@ edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup edu.cornell.mannlib.vitro.webapp.visualization.setup.VisualizationSetup +org.vivoweb.webapp.startup.DataGetterN3Setup org.vivoweb.webapp.startup.GeneratorSetup org.vivoweb.webapp.startup.SearchResultTemplateModelSetup