You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/02/10 13:47:23 UTC
[39/50] [abbrv] incubator-taverna-language git commit: less Sesame
less Sesame
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/0f5c2e35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/0f5c2e35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/0f5c2e35
Branch: refs/heads/wfdesc-jena
Commit: 0f5c2e354ec3b9a3c8b1842342ca1388f5d2b5c0
Parents: afe14bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Feb 26 23:13:03 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Feb 10 11:04:48 2016 +0000
----------------------------------------------------------------------
.../taverna/scufl2/wfdesc/WfdescSerialiser.java | 29 ++------------------
1 file changed, 3 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0f5c2e35/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
index 28a2c1b..ee541ff 100644
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
+++ b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
@@ -76,7 +76,6 @@ import org.purl.wf4ever.wfdesc.Output;
import org.purl.wf4ever.wfdesc.Process;
import org.w3.prov.Entity;
-
import com.fasterxml.jackson.databind.JsonNode;
public class WfdescSerialiser {
@@ -97,42 +96,20 @@ public class WfdescSerialiser {
.create("http://ns.taverna.org.uk/2010/activity/tool");
private Scufl2Tools scufl2Tools = new Scufl2Tools();
- private SesameManager sesameManager;
private URITools uriTools = new URITools();
private WorkflowBundle wfBundle;
- public Repository getRepository() {
- return getSesameManager().getConnection().getRepository();
- }
public Scufl2Tools getScufl2Tools() {
return scufl2Tools;
}
- public SesameManager getSesameManager() {
- if (sesameManager == null) {
-
- // Raven workaround - register SPARQLParserFactory
- QueryParserRegistry.getInstance().add(new SPARQLParserFactory());
-
- ElmoModule module = new ElmoModule();
- module.addConcept(Labelled.class);
- SesameManagerFactory factory = new SesameManagerFactory(module);
- factory.setInferencingEnabled(true);
- sesameManager = factory.createElmoManager();
- }
- return sesameManager;
- }
-
public URITools getUriTools() {
return uriTools;
}
- private QName qnameForBean(WorkflowBean bean) {
- URI uri = uriTools.uriForBean(bean);
- org.openrdf.model.URI sesameUri = getRepository().getValueFactory()
- .createURI(uri.toASCIIString());
- return new QName(sesameUri.getNamespace(), sesameUri.getLocalName());
+ private String uriForBean(WorkflowBean bean) {
+ return uriTools.uriForBean(bean).toASCIIString();
}
protected void save(final WorkflowBundle bundle) {
@@ -319,7 +296,7 @@ public class WfdescSerialiser {
}
private <T> T entityForBean(WorkflowBean bean, Class<T> type) {
- return getSesameManager().create(qnameForBean(bean), type);
+ return getSesameManager().create(uriForBean(bean), type);
}
// @Override