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

VIVO-1614 - Update to allow the TPF API to be toggled via the runtime.properties. (#127)

Browse source 
* Update to allow the TPF API to be toggled via the runtime.properties.

Resolves: https://jira.duraspace.org/browse/VIVO-1614
This commit is contained in:
Ralph O'Flinn 2019-08-02 12:20:15 -05:00 • committed by Andrew Woods
parent 1a2debe5c3
commit b45d20c9e4
3 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
View file

@ -6,8 +6,10 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
import org.apache.commons.io.IOUtils;
import org.apache.jena.riot.Lang;
import org.apache.commons.lang3.StringUtils;
import org.linkeddatafragments.config.ConfigReader;
import org.linkeddatafragments.datasource.DataSourceFactory;
import org.linkeddatafragments.datasource.DataSourceTypesRegistry;
@ -47,11 +49,15 @@ import java.util.Map.Entry;
@WebServlet(name = "TpfServlet", urlPatterns = {"/tpf/*"})
public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
private final static long serialVersionUID = 1L;
private final static long serialVersionUID = 1L;
private static final String PROPERTY_TPF_ACTIVE_FLAG = "tpf.activeFlag";
private ConfigReader config;
private final HashMap<String, IDataSource> dataSources = new HashMap<>();
private final Collection<String> mimeTypes = new ArrayList<>();
private ConfigurationProperties configProps;
private String tpfActiveFlag;
private File getConfigFile(ServletConfig config) throws IOException {
String path = config.getServletContext().getRealPath("/");
@ -73,6 +79,16 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
public void init(ServletConfig servletConfig) throws ServletException {
try {
ServletContext ctx = servletConfig.getServletContext();
configProps = ConfigurationProperties.getBean(ctx);
if (!configurationPresent()) {
throw new ServletException("TPF is currently disabled. To enable, add 'tpfActive.flag=true' to the runtime.properties.");
} else {
if (!tpfActiveFlag.equalsIgnoreCase("true")) {
throw new ServletException("TPF is currently disabled. To enable, set 'tpfActive.flag=true' in runtime.properties.");
}
}
RDFService rdfService = ModelAccess.on(ctx).getRDFService();
RDFServiceBasedRequestProcessorForTPFs.setRDFService(rdfService);
@ -120,6 +136,16 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
}
}
private boolean configurationPresent() {
String activeFlag = configProps.getProperty(PROPERTY_TPF_ACTIVE_FLAG);
if (StringUtils.isNotEmpty(activeFlag)) {
this.tpfActiveFlag = activeFlag;
return true;
} else {
return false;
}
}
private IDataSource getDataSource(HttpServletRequest request) throws DataSourceNotFoundException {
String contextPath = request.getContextPath();
String requestURI = request.getRequestURI();